11 files changed, 31 insertions, 19 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8e5cb667413..4be1e28dbcd 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,19 @@
+2013-02-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * xml.c (init_libxml2_functions):
+        * sound.c (sound_warning):
+        * sheap.c (report_sheap_usage):
+        * process.c (wait_reading_process_output):
+        * msdos.c (XMenuActivate):
+        * macros.c (Fstart_kbd_macro, Fend_kbd_macro):
+        * keyboard.c (top_level_1):
+        * editfns.c (Fmessage, Fmessage_box):
+        * callint.c (Fcall_interactively):
+        * fns.c (Fyes_or_no_p): Prefer `message1' over `message'.
+
 2013-02-17  Jan Djärv  <jan.h.d@swipnet.se>
 
         * xterm.c (syms_of_xterm): Move scroll-bar-adjust-thumb-portion ...
-
         * frame.c (syms_of_frame): ... to here.
 
 2013-02-16  Eli Zaretskii  <eliz@gnu.org>
diff --git a/src/callint.c b/src/callint.c
index 1a125d3e865..3e295a3b26b 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -690,7 +690,7 @@ invoke it.  If KEYS is omitted or nil, the return value of
                 Lisp_Object str;
                 if (! first)
                   {
-                    message ("Please enter a number.");
+                    message1 ("Please enter a number.");
                     sit_for (make_number (1), 0, 0);
                   }
                 first = 0;
diff --git a/src/editfns.c b/src/editfns.c
index c5cd8b0b725..bee0bcc158d 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -3451,7 +3451,7 @@ usage: (message FORMAT-STRING &rest ARGS)  */)
       || (STRINGP (args[0])
           && SBYTES (args[0]) == 0))
     {
-      message (0);
+      message1 (0);
       return args[0];
     }
   else
@@ -3477,7 +3477,7 @@ usage: (message-box FORMAT-STRING &rest ARGS)  */)
 {
   if (NILP (args[0]))
     {
-      message (0);
+      message1 (0);
       return Qnil;
     }
   else
diff --git a/src/fns.c b/src/fns.c
index 527976593da..44ddf340856 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -2485,7 +2485,7 @@ is nil, and `use-dialog-box' is non-nil.  */)
 
       Fding (Qnil);
       Fdiscard_input ();
-      message ("Please answer yes or no.");
+      message1 ("Please answer yes or no.");
       Fsleep_for (make_number (2), Qnil);
     }
 }
diff --git a/src/keyboard.c b/src/keyboard.c
index 69c68d13943..77037f647e9 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1185,13 +1185,13 @@ top_level_2 (void)
 static Lisp_Object
 top_level_1 (Lisp_Object ignore)
 {
-  /* On entry to the outer level, run the startup file */
+  /* On entry to the outer level, run the startup file.  */
   if (!NILP (Vtop_level))
     internal_condition_case (top_level_2, Qerror, cmd_error);
   else if (!NILP (Vpurify_flag))
-    message ("Bare impure Emacs (standard Lisp code not loaded)");
+    message1 ("Bare impure Emacs (standard Lisp code not loaded)");
   else
-    message ("Bare Emacs (standard Lisp code not loaded)");
+    message1 ("Bare Emacs (standard Lisp code not loaded)");
   return Qnil;
 }
 
diff --git a/src/macros.c b/src/macros.c
index 1eef9b678f4..0dcfbe5532c 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -78,7 +78,7 @@ macro before appending to it. */)
         }
       current_kboard->kbd_macro_ptr = current_kboard->kbd_macro_buffer;
       current_kboard->kbd_macro_end = current_kboard->kbd_macro_buffer;
-      message ("Defining kbd macro...");
+      message1 ("Defining kbd macro...");
     }
   else
     {
@@ -125,7 +125,7 @@ macro before appending to it. */)
         Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro),
                             make_number (1), Qnil);
 
-      message ("Appending to kbd macro...");
+      message1 ("Appending to kbd macro...");
     }
   kset_defining_kbd_macro (current_kboard, Qt);
 
@@ -172,21 +172,21 @@ each iteration of the macro.  Iteration stops if LOOPFUNC returns nil.  */)
   if (!NILP (KVAR (current_kboard, defining_kbd_macro)))
     {
       end_kbd_macro ();
-      message ("Keyboard macro defined");
+      message1 ("Keyboard macro defined");
     }
 
   if (XFASTINT (repeat) == 0)
     Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro), repeat, loopfunc);
   else if (XINT (repeat) > 1)
     {
-      XSETINT (repeat, XINT (repeat)-1);
+      XSETINT (repeat, XINT (repeat) - 1);
       Fexecute_kbd_macro (KVAR (current_kboard, Vlast_kbd_macro),
                           repeat, loopfunc);
     }
   return Qnil;
 }
 
-/* Store character c into kbd macro being defined */
+/* Store character c into kbd macro being defined.  */
 
 void
 store_kbd_macro_char (Lisp_Object c)
diff --git a/src/msdos.c b/src/msdos.c
index 527a75c8c2f..ac8c90455d7 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -3281,10 +3281,10 @@ XMenuActivate (Display *foo, XMenu *menu, int *pane, int *selidx,
      erasing it works correctly...  */
   if (! NILP (saved_echo_area_message))
     message_with_string ("%s", saved_echo_area_message, 0);
-  message (0);
+  message1 (0);
   while (statecount--)
     xfree (state[statecount].screen_behind);
-  IT_display_cursor (1);        /* turn cursor back on */
+  IT_display_cursor (1);        /* Turn cursor back on.  */
   /* Clean up any mouse events that are waiting inside Emacs event queue.
      These events are likely to be generated before the menu was even
      displayed, probably because the user pressed and released the button
diff --git a/src/process.c b/src/process.c
index 9d6e8c097a1..5b15ade1122 100644
--- a/src/process.c
+++ b/src/process.c
@@ -4218,7 +4218,7 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
   if (time_limit == 0 && nsecs == 0 && wait_proc && !NILP (Vinhibit_quit)
       && !(CONSP (wait_proc->status)
            && EQ (XCAR (wait_proc->status), Qexit)))
-    message ("Blocking call to accept-process-output with quit inhibited!!");
+    message1 ("Blocking call to accept-process-output with quit inhibited!!");
 
   /* If wait_proc is a process to watch, set wait_channel accordingly.  */
   if (wait_proc != NULL)
diff --git a/src/sheap.c b/src/sheap.c
index 972c04c9552..06e205bc0e5 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -91,5 +91,5 @@ report_sheap_usage (int die_if_pure_storage_exceeded)
   char buf[200];
   sprintf (buf, "Static heap usage: %d of %d bytes",
            bss_sbrk_ptr - bss_sbrk_buffer, STATIC_HEAP_SIZE);
-  message ("%s", buf);
+  message1 (buf);
 }
diff --git a/src/sound.c b/src/sound.c
index 802f1ce740d..9c472fb0263 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -334,7 +334,7 @@ sound_perror (const char *msg)
 static void
 sound_warning (const char *msg)
 {
-  message ("%s", msg);
+  message1 (msg);
 }
 
 
diff --git a/src/xml.c b/src/xml.c
index 5a52b0c2a1e..4b466dc1bca 100644
--- a/src/xml.c
+++ b/src/xml.c
@@ -93,7 +93,7 @@ init_libxml2_functions (void)
 
       if (!(library = w32_delayed_load (Qlibxml2_dll)))
         {
-          message ("%s", "libxml2 library not found");
+          message1 ("libxml2 library not found");
           return 0;
         }