Mercurial > hg > xemacs-beta

diff src/redisplay.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 97eb4942aec8
children 39304a35b6b3 308d34e9f07d
line wrap: on
line diff
--- a/src/redisplay.c	Fri Apr 09 02:33:11 2010 -0500
+++ b/src/redisplay.c	Fri Apr 09 23:38:02 2010 -0500
@@ -2223,9 +2223,9 @@
   else if (MINI_WINDOW_P (w) && !active_minibuffer)
     data.cursor_type = NO_CURSOR;
   else if (w == XWINDOW (FRAME_SELECTED_WINDOW (f)) &&
-	   EQ(DEVICE_CONSOLE(d), Vselected_console) &&
-	   d == XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d))))&&
-	   f == XFRAME(DEVICE_SELECTED_FRAME(d)))
+	   EQ (DEVICE_CONSOLE (d), Vselected_console) &&
+	   d == XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d))))&&
+	   f == XFRAME (DEVICE_SELECTED_FRAME (d)))
     {
       data.byte_cursor_charpos = BYTE_BUF_PT (b);
       data.cursor_type = CURSOR_ON;
@@ -5519,10 +5519,10 @@
       Lisp_Object string;
       prop = Dynarr_new (prop_block);
 
-      string = concat2(Vminibuf_preprompt, Vminibuf_prompt);
+      string = concat2 (Vminibuf_preprompt, Vminibuf_prompt);
       pb.type = PROP_MINIBUF_PROMPT;
-      pb.data.p_string.str = XSTRING_DATA(string);
-      pb.data.p_string.len = XSTRING_LENGTH(string);
+      pb.data.p_string.str = XSTRING_DATA (string);
+      pb.data.p_string.len = XSTRING_LENGTH (string);
       Dynarr_add (prop, pb);
     }
   else
@@ -6261,9 +6261,9 @@
   selected_in_its_frame = (w == XWINDOW (FRAME_SELECTED_WINDOW (f)));
   selected_globally =
       selected_in_its_frame &&
-      EQ(DEVICE_CONSOLE(d), Vselected_console) &&
-      XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d &&
-      XFRAME(DEVICE_SELECTED_FRAME(d)) == f;
+      EQ (DEVICE_CONSOLE (d), Vselected_console) &&
+      XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d)))) == d &&
+      XFRAME (DEVICE_SELECTED_FRAME (d)) == f;
   if (skip_selected && selected_in_its_frame)
     return;
 
@@ -7069,7 +7069,7 @@
 
   if (FRAME_REPAINT_P (f))
     {
-      if (CLASS_REDISPLAY_FLAGS_CHANGEDP(f))
+      if (CLASS_REDISPLAY_FLAGS_CHANGEDP (f))
 	{
 	  int preempted = redisplay_frame (f, 1);
 	  if (preempted)
@@ -7243,10 +7243,10 @@
      fail if DEVICE_SELECTED_FRAME == Qnil (since w->frame cannot be).
      This can occur when the frame title is computed really early */
   Charbpos pos =
-    ((EQ(DEVICE_SELECTED_FRAME(d), w->frame) &&
-       (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame(d)))) &&
-      EQ(DEVICE_CONSOLE(d), Vselected_console) &&
-      XDEVICE(CONSOLE_SELECTED_DEVICE(XCONSOLE(DEVICE_CONSOLE(d)))) == d )
+    ((EQ (DEVICE_SELECTED_FRAME (d), w->frame) &&
+       (w == XWINDOW (FRAME_SELECTED_WINDOW (device_selected_frame (d)))) &&
+      EQ (DEVICE_CONSOLE (d), Vselected_console) &&
+      XDEVICE (CONSOLE_SELECTED_DEVICE (XCONSOLE (DEVICE_CONSOLE (d)))) == d )
      ? BUF_PT (b)
      : marker_position (w->pointm[type]));
   EMACS_INT line;
@@ -7988,7 +7988,7 @@
 			int partially)
 {
   struct buffer *b = XBUFFER (w->buffer);
-  int pixpos = -WINDOW_TEXT_TOP_CLIP(w);
+  int pixpos = -WINDOW_TEXT_TOP_CLIP (w);
   int bottom = WINDOW_TEXT_HEIGHT (w);
   int start_elt;
 
@@ -9709,7 +9709,7 @@
   for (i = 0; i < Dynarr_largest (dyn); i++)
     {
       struct display_line *dl = &Dynarr_at (dyn, i);
-      total += compute_display_block_dynarr_usage(dl->display_blocks, ustats);
+      total += compute_display_block_dynarr_usage (dl->display_blocks, ustats);
       total += compute_glyph_block_dynarr_usage  (dl->left_glyphs,    ustats);
       total += compute_glyph_block_dynarr_usage  (dl->right_glyphs,   ustats);
     }