[Emacs-diffs] trunk r117357: * src/callint.c (Fcall_interactively): Fix up last change.

[Stefan Monnier]

------------------------------------------------------------
revno: 117357
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17701
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Tue 2014-06-17 09:50:22 -0400
message:
  * src/callint.c (Fcall_interactively): Fix up last change.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/callint.c                  callint.c-20091113204419-o5vbwnq5f7feedwu-279
  src/editfns.c                  editfns.c-20091113204419-o5vbwnq5f7feedwu-255
  src/keyboard.c                 keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
  src/lread.c                    lread.c-20091113204419-o5vbwnq5f7feedwu-266

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2014-06-17 13:41:14 +0000
+++ b/src/ChangeLog     2014-06-17 13:50:22 +0000
@@ -1,3 +1,7 @@
+2014-06-17  Stefan Monnier  <address@hidden>
+
+       * callint.c (Fcall_interactively): Fix up last change (bug#17701).
+
 2014-06-17  Dmitry Antipov  <address@hidden>
 
        * fileio.c (Fread_file_name): Do not pass redundant args and ...

=== modified file 'src/callint.c'
--- a/src/callint.c     2014-06-17 03:14:00 +0000
+++ b/src/callint.c     2014-06-17 13:50:22 +0000
@@ -535,7 +535,7 @@
     {
       visargs[1] = make_string (tem + 1, strcspn (tem + 1, "\n"));
       if (strchr (SSDATA (visargs[1]), '%'))
-       callint_message = Fformat (i, visargs);
+       callint_message = Fformat (i - 1, visargs + 1);
       else
        callint_message = visargs[1];
 

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2014-03-26 17:55:31 +0000
+++ b/src/editfns.c     2014-06-17 13:50:22 +0000
@@ -3600,7 +3600,7 @@
 usage: (format STRING &rest OBJECTS)  */)
   (ptrdiff_t nargs, Lisp_Object *args)
 {
-  ptrdiff_t n;         /* The number of the next arg to substitute */
+  ptrdiff_t n;         /* The number of the next arg to substitute.  */
   char initial_buffer[4000];
   char *buf = initial_buffer;
   ptrdiff_t bufsize = sizeof initial_buffer;

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2014-06-08 18:27:22 +0000
+++ b/src/keyboard.c    2014-06-17 13:50:22 +0000
@@ -3654,7 +3654,8 @@
       *kbd_store_ptr = *event;
       ++kbd_store_ptr;
 #ifdef subprocesses
-      if (kbd_buffer_nr_stored () > KBD_BUFFER_SIZE/2 && ! kbd_on_hold_p ())
+      if (kbd_buffer_nr_stored () > KBD_BUFFER_SIZE / 2
+         && ! kbd_on_hold_p ())
         {
           /* Don't read keyboard input until we have processed kbd_buffer.
              This happens when pasting text longer than KBD_BUFFER_SIZE/2.  */
@@ -7481,8 +7482,8 @@
   {
     int i = menu_bar_items_index;
     if (i + 4 > ASIZE (menu_bar_items_vector))
-      menu_bar_items_vector =
-       larger_vector (menu_bar_items_vector, 4, -1);
+      menu_bar_items_vector
+       = larger_vector (menu_bar_items_vector, 4, -1);
     /* Add this item.  */
     ASET (menu_bar_items_vector, i, Qnil); i++;
     ASET (menu_bar_items_vector, i, Qnil); i++;

=== modified file 'src/lread.c'
--- a/src/lread.c       2014-04-22 07:04:34 +0000
+++ b/src/lread.c       2014-06-17 13:50:22 +0000
@@ -3850,7 +3850,7 @@
       SET_SYMBOL_VAL (XSYMBOL (sym), sym);
     }
 
-  ptr = aref_addr (obarray, XINT(tem));
+  ptr = aref_addr (obarray, XINT (tem));
   if (SYMBOLP (*ptr))
     set_symbol_next (sym, XSYMBOL (*ptr));
   else