Mercurial > hg > xemacs-beta

diff src/specifier.c @ 5198:bc3ede8f29a8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix spacing in some files -------------------- ChangeLog entries follow: -------------------- src/ChangeLog addition: 2010-04-09 Ben Wing <ben@xemacs.org> * fileio.c (check_writable): * fileio.c (Fdo_auto_save): * redisplay-xlike-inc.c (separate_textual_runs_nomule): * redisplay-xlike-inc.c (separate_textual_runs_xft_nomule): * redisplay-xlike-inc.c (separate_textual_runs_xft_mule): * redisplay-xlike-inc.c (separate_textual_runs_mule): * redisplay-xlike-inc.c (XLIKE_output_string): * redisplay-xlike-inc.c (XLIKE_output_vertical_divider): * redisplay.c (create_text_block): * redisplay.c (regenerate_window): * redisplay.c (redisplay_window): * redisplay.c (redisplay_device): * redisplay.c (window_line_number): * redisplay.c (point_would_be_visible): * redisplay.c (compute_display_line_dynarr_usage): * specifier.c (prune_specifiers): * specifier.c (finalize_specifier): * specifier.c (make_magic_specifier): * specifier.c (charset_matches_specifier_tag_set_p): * specifier.c (Fdefine_specifier_tag): * specifier.c (setup_device_initial_specifier_tags): * specifier.c (bodily_specifier): * specifier.c (add_spec_to_ghost_specifier): * specifier.c (remove_ghost_specifier): * specifier.c (set_specifier_fallback): * specifier.c (specifier_instance_from_inst_list): * specifier.c (set_specifier_caching): Fix coding style to correspond to GNU standard.
author Ben Wing <ben@xemacs.org>
date Fri, 09 Apr 2010 23:38:02 -0500
parents 71ee43b8a74d
children 1c615eb1e4b2
line wrap: on
line diff
--- a/src/specifier.c	Fri Apr 09 02:33:11 2010 -0500
+++ b/src/specifier.c	Fri Apr 09 23:38:02 2010 -0500
@@ -257,9 +257,9 @@
 	  Lisp_Specifier* sp = XSPECIFIER (rest);
 	  /* A bit of assertion that we're removing both parts of the
 	     magic one altogether */
-	  assert (!MAGIC_SPECIFIER_P(sp)
-		  || (BODILY_SPECIFIER_P(sp) && marked_p (sp->fallback))
-		  || (GHOST_SPECIFIER_P(sp) && marked_p (sp->magic_parent)));
+	  assert (!MAGIC_SPECIFIER_P (sp)
+		  || (BODILY_SPECIFIER_P (sp) && marked_p (sp->fallback))
+		  || (GHOST_SPECIFIER_P (sp) && marked_p (sp->magic_parent)));
 	  /* This specifier is garbage.  Remove it from the list. */
 	  if (NILP (prev))
 	    Vall_specifiers = sp->next_specifier;
@@ -310,7 +310,7 @@
 finalize_specifier (Lisp_Object obj)
 {
   Lisp_Specifier *sp = XSPECIFIER (obj);
-  if (!GHOST_SPECIFIER_P(sp) && sp->caching)
+  if (!GHOST_SPECIFIER_P (sp) && sp->caching)
     {
       xfree (sp->caching);
       sp->caching = 0;
@@ -558,9 +558,9 @@
   UNGCPRO;
 
   /* Connect guys together */
-  XSPECIFIER(bodily)->magic_parent = Qt;
-  XSPECIFIER(bodily)->fallback = ghost;
-  XSPECIFIER(ghost)->magic_parent = bodily;
+  XSPECIFIER (bodily)->magic_parent = Qt;
+  XSPECIFIER (bodily)->fallback = ghost;
+  XSPECIFIER (ghost)->magic_parent = bodily;
 
   return bodily;
 }
@@ -981,7 +981,7 @@
   Lisp_Object rest;
   int res = 0;
 
-  assert(stage < NUM_MATCHSPEC_STAGES);
+  assert (stage < NUM_MATCHSPEC_STAGES);
 
   LIST_LOOP (rest, tag_set)
     {
@@ -1253,7 +1253,7 @@
 	}
     }
 
-  return define_specifier_tag(tag, device_predicate, charset_predicate);
+  return define_specifier_tag (tag, device_predicate, charset_predicate);
 }
 
 /* Called at device-creation time to initialize the user-defined
@@ -1276,11 +1276,11 @@
   for (rest = Vuser_defined_tags, rest2 = DEVICE_USER_DEFINED_TAGS (d);
        !NILP (rest); rest = XCDR (rest), rest2 = XCDR (rest2))
     {
-      GET_LIST_LENGTH(XCAR(rest), list_len);
-
-      assert(3 == list_len);
-
-      device_predicate = XCADR(XCAR (rest));
+      GET_LIST_LENGTH (XCAR(rest), list_len);
+
+      assert (3 == list_len);
+
+      device_predicate = XCADR (XCAR (rest));
 
       if (NILP (device_predicate))
 	{
@@ -1641,7 +1641,7 @@
 bodily_specifier (Lisp_Object spec)
 {
   return (GHOST_SPECIFIER_P (XSPECIFIER (spec))
-	  ? XSPECIFIER(spec)->magic_parent : spec);
+	  ? XSPECIFIER (spec)->magic_parent : spec);
 }
 
 /* Signal error if (specifier SPEC is read-only.
@@ -2319,7 +2319,7 @@
 			     Lisp_Object how_to_add)
 {
   int depth = unlock_ghost_specifiers_protected ();
-  Fadd_spec_to_specifier (XSPECIFIER(specifier)->fallback,
+  Fadd_spec_to_specifier (XSPECIFIER (specifier)->fallback,
 			  instantiator, locale, tag_set, how_to_add);
   unbind_to (depth);
 }
@@ -2517,7 +2517,7 @@
 			Lisp_Object tag_set, Lisp_Object exact_p)
 {
   int depth = unlock_ghost_specifiers_protected ();
-  Fremove_specifier (XSPECIFIER(specifier)->fallback,
+  Fremove_specifier (XSPECIFIER (specifier)->fallback,
 		     locale, tag_set, exact_p);
   unbind_to (depth);
 }
@@ -2705,7 +2705,7 @@
   if (SPECIFIERP (fallback))
     assert (EQ (Fspecifier_type (specifier), Fspecifier_type (fallback)));
   if (BODILY_SPECIFIER_P (sp))
-    GHOST_SPECIFIER(sp)->fallback = fallback;
+    GHOST_SPECIFIER (sp)->fallback = fallback;
   else
     sp->fallback = fallback;
   /* call the after-change method */
@@ -2795,14 +2795,14 @@
 
 	  FROB (initial, STAGE_INITIAL)
 	  else FROB (final, STAGE_FINAL)
-	  else assert(0);
+	  else assert (0);
 #undef FROB
 
 	}
     }
 #endif /* MULE */
 
-  LIST_LOOP(rest, inst_list)
+  LIST_LOOP (rest, inst_list)
     {
       Lisp_Object tagged_inst = XCAR (rest);
       Lisp_Object tag_set = XCAR (tagged_inst);
@@ -2816,7 +2816,7 @@
       val = XCDR (tagged_inst);
       the_instantiator = val;
 
-      if (!NILP(charset) &&
+      if (!NILP (charset) &&
 	  !(charset_matches_specifier_tag_set_p (charset, tag_set, stage)))
 	{
 	  ++respected_charsets;
@@ -3392,7 +3392,7 @@
   sp->caching->always_recompute = always_recompute;
   Vcached_specifiers = Fcons (specifier, Vcached_specifiers);
   if (BODILY_SPECIFIER_P (sp))
-    GHOST_SPECIFIER(sp)->caching = sp->caching;
+    GHOST_SPECIFIER (sp)->caching = sp->caching;
   recompute_cached_specifier_everywhere (specifier);
 }