* src/callint.c (Fcall_interactively): Fix up last change.

Fixes: debbugs:17701

diff --git a/src/ChangeLog b/src/ChangeLog
index 177cfab..7917953 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * callint.c (Fcall_interactively): Fix up last change (bug#17701).
+
 2014-06-17  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * fileio.c (Fread_file_name): Do not pass redundant args and ...

diff --git a/src/callint.c b/src/callint.c
index b4dbc7e..817f84d 100644 (file)
--- a/src/callint.c
+++ b/src/callint.c
@@ -535,7 +535,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
     {
       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];
 

diff --git a/src/editfns.c b/src/editfns.c
index 9c1fcb0..40fac27 100644 (file)
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3600,7 +3600,7 @@ specifier truncates the string to the given width.
 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;

diff --git a/src/keyboard.c b/src/keyboard.c
index dcf8913..23f0540 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -3654,7 +3654,8 @@ kbd_buffer_store_event_hold (register struct input_event *event,
       *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 @@ menu_bar_items (Lisp_Object old)
   {
     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++;

diff --git a/src/lread.c b/src/lread.c
index 4edd117..41ea1f1 100644 (file)
--- a/src/lread.c
+++ b/src/lread.c
@@ -3850,7 +3850,7 @@ it defaults to the value of `obarray'.  */)
       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