[Emacs-diffs] /srv/bzr/emacs/trunk r111820: Prefer `message1' over `message'.

[Stefan Monnier]

------------------------------------------------------------
revno: 111820
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Sun 2013-02-17 11:49:27 -0500
message:
  Prefer `message1' over `message'.
  * src/xml.c (init_libxml2_functions):
  * src/sound.c (sound_warning):
  * src/sheap.c (report_sheap_usage):
  * src/process.c (wait_reading_process_output):
  * src/msdos.c (XMenuActivate):
  * src/macros.c (Fstart_kbd_macro, Fend_kbd_macro):
  * src/keyboard.c (top_level_1):
  * src/editfns.c (Fmessage, Fmessage_box):
  * src/callint.c (Fcall_interactively):
  * src/fns.c (Fyes_or_no_p): Prefer `message1' over `message'.
modified:
  src/ChangeLog
  src/callint.c
  src/editfns.c
  src/fns.c
  src/keyboard.c
  src/macros.c
  src/msdos.c
  src/process.c
  src/sheap.c
  src/sound.c
  src/xml.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-02-17 10:41:33 +0000
+++ b/src/ChangeLog     2013-02-17 16:49:27 +0000
@@ -1,7 +1,19 @@
+2013-02-17  Stefan Monnier  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xterm.c (syms_of_xterm): Move scroll-bar-adjust-thumb-portion ...
-
        * frame.c (syms_of_frame): ... to here.
 
 2013-02-16  Eli Zaretskii  <address@hidden>

=== modified file 'src/callint.c'
--- a/src/callint.c     2013-01-23 20:07:28 +0000
+++ b/src/callint.c     2013-02-17 16:49:27 +0000
@@ -690,7 +690,7 @@
                Lisp_Object str;
                if (! first)
                  {
-                   message ("Please enter a number.");
+                   message1 ("Please enter a number.");
                    sit_for (make_number (1), 0, 0);
                  }
                first = 0;

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2013-02-11 23:37:18 +0000
+++ b/src/editfns.c     2013-02-17 16:49:27 +0000
@@ -3451,7 +3451,7 @@
       || (STRINGP (args[0])
          && SBYTES (args[0]) == 0))
     {
-      message (0);
+      message1 (0);
       return args[0];
     }
   else
@@ -3477,7 +3477,7 @@
 {
   if (NILP (args[0]))
     {
-      message (0);
+      message1 (0);
       return Qnil;
     }
   else

=== modified file 'src/fns.c'
--- a/src/fns.c 2013-02-09 22:42:33 +0000
+++ b/src/fns.c 2013-02-17 16:49:27 +0000
@@ -2485,7 +2485,7 @@
 
       Fding (Qnil);
       Fdiscard_input ();
-      message ("Please answer yes or no.");
+      message1 ("Please answer yes or no.");
       Fsleep_for (make_number (2), Qnil);
     }
 }

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2013-02-15 18:52:16 +0000
+++ b/src/keyboard.c    2013-02-17 16:49:27 +0000
@@ -1185,13 +1185,13 @@
 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;
 }
 

=== modified file 'src/macros.c'
--- a/src/macros.c      2013-01-01 09:11:05 +0000
+++ b/src/macros.c      2013-02-17 16:49:27 +0000
@@ -78,7 +78,7 @@
        }
       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 @@
        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 @@
   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)

=== modified file 'src/msdos.c'
--- a/src/msdos.c       2013-02-09 09:02:17 +0000
+++ b/src/msdos.c       2013-02-17 16:49:27 +0000
@@ -3281,10 +3281,10 @@
      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

=== modified file 'src/process.c'
--- a/src/process.c     2013-02-15 19:08:11 +0000
+++ b/src/process.c     2013-02-17 16:49:27 +0000
@@ -4218,7 +4218,7 @@
   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)

=== modified file 'src/sheap.c'
--- a/src/sheap.c       2013-01-01 09:11:05 +0000
+++ b/src/sheap.c       2013-02-17 16:49:27 +0000
@@ -91,5 +91,5 @@
   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);
 }

=== modified file 'src/sound.c'
--- a/src/sound.c       2013-01-01 09:11:05 +0000
+++ b/src/sound.c       2013-02-17 16:49:27 +0000
@@ -334,7 +334,7 @@
 static void
 sound_warning (const char *msg)
 {
-  message ("%s", msg);
+  message1 (msg);
 }
 
 

=== modified file 'src/xml.c'
--- a/src/xml.c 2013-01-11 13:25:10 +0000
+++ b/src/xml.c 2013-02-17 16:49:27 +0000
@@ -93,7 +93,7 @@
 
       if (!(library = w32_delayed_load (Qlibxml2_dll)))
        {
-         message ("%s", "libxml2 library not found");
+         message1 ("libxml2 library not found");
          return 0;
        }