emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r103559: * cmds.c (internal_self_inse


From: Paul Eggert
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r103559: * cmds.c (internal_self_insert): Reindent to match Emacs style.
Date: Sun, 06 Mar 2011 01:00:53 -0800
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 103559
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-03-06 01:00:53 -0800
message:
  * cmds.c (internal_self_insert): Reindent to match Emacs style.
modified:
  src/ChangeLog
  src/cmds.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-03-06 08:17:04 +0000
+++ b/src/ChangeLog     2011-03-06 09:00:53 +0000
@@ -1,5 +1,7 @@
 2011-03-06  Paul Eggert  <address@hidden>
 
+       * cmds.c (internal_self_insert): Reindent to match Emacs style.
+
        * xdisp.c: Rename or move local decls to avoid shadowing.
        (init_iterator, handle_fontified_prop, handle_single_display_spec):
        (message_dolog, message_with_string, redisplay_internal):

=== modified file 'src/cmds.c'
--- a/src/cmds.c        2011-02-16 16:35:16 +0000
+++ b/src/cmds.c        2011-03-06 09:00:53 +0000
@@ -386,28 +386,29 @@
          int target_clm = ((int) current_column () /* iftc */
                            + n * (int) XINT (Fchar_width (make_number (c))));
 
-             /* The actual cursor position after the trial of moving
-                to column TARGET_CLM.  It is greater than TARGET_CLM
-                if the TARGET_CLM is middle of multi-column
-                character.  In that case, the new point is set after
-                that character.  */
-             int actual_clm
-               = (int) XFASTINT (Fmove_to_column (make_number (target_clm),
-                                                  Qnil));
-
-             chars_to_delete = PT - pos;
-
-             if (actual_clm > target_clm)
-           { /* We will delete too many columns.  Let's fill columns
-                    by spaces so that the remaining text won't move.  */
+         /* The actual cursor position after the trial of moving
+            to column TARGET_CLM.  It is greater than TARGET_CLM
+            if the TARGET_CLM is middle of multi-column
+            character.  In that case, the new point is set after
+            that character.  */
+         int actual_clm
+           = (int) XFASTINT (Fmove_to_column (make_number (target_clm),
+                                              Qnil));
+
+         chars_to_delete = PT - pos;
+
+         if (actual_clm > target_clm)
+           {
+             /* We will delete too many columns.  Let's fill columns
+                by spaces so that the remaining text won't move.  */
              EMACS_INT actual = PT_BYTE;
              DEC_POS (actual);
              if (FETCH_CHAR (actual) == '\t')
                /* Rather than add spaces, let's just keep the tab. */
                chars_to_delete--;
              else
-                 spaces_to_insert = actual_clm - target_clm;
-               }
+               spaces_to_insert = actual_clm - target_clm;
+           }
 
          SET_PT_BOTH (pos, pos_byte);
        }


reply via email to

[Prev in Thread] Current Thread [Next in Thread]