* src/keyboard.c (echo_add_key): Rename from echo_add_char.

diff --git a/src/ChangeLog b/src/ChangeLog
index 3b0b295e695b2b6f4ec389e7c77a0413b8d9d8d8..f5dacabd1307b192f6d409e542bd1648df75456c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-01-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * keyboard.c (echo_add_key): Rename from echo_add_char.
+
 2013-01-06  Chong Yidong  <cyd@gnu.org>
 
        * keyboard.c (echo_add_char): New function, factored out from
@@ -11,8 +15,8 @@
 
        * xdisp.c (dump_glyph): Align glyph data better.  Use "pD" instead
        of a non-portable "t" to print ptrdiff_t values.  Allow up to 9
-       digits for buffer positions, before misalignment starts.  Display
-       "0" for integer "object" field.
+       digits for buffer positions, before misalignment starts.
+       Display "0" for integer "object" field.
        (dump_glyph_row): Adapt the header line to changes in dump_glyph.
        Display the newline glyph more unambiguously.
 
@@ -53,8 +57,8 @@
 2012-12-31  Eli Zaretskii  <eliz@gnu.org>
 
        * w32.c (unsetenv): Set up the string passed to _putenv
-       correctly.  See
-       http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00863.html
+       correctly.
+       See http://lists.gnu.org/archive/html/emacs-devel/2012-12/msg00863.html
        for the bug this caused.
 
 2012-12-30  Paul Eggert  <eggert@cs.ucla.edu>
@@ -126,8 +130,8 @@
 
 2012-12-27  Eli Zaretskii  <eliz@gnu.org>
 
-       * fileio.c (file_name_as_directory, directory_file_name): Accept
-       an additional argument MULTIBYTE to indicate whether the input C
+       * fileio.c (file_name_as_directory, directory_file_name):
+       Accept an additional argument MULTIBYTE to indicate whether the input C
        came from a multibyte or a unibyte Lisp string; all callers
        adjusted.  Don't assume the input string is always multibyte.
        (Bug#13262)
@@ -211,8 +215,8 @@
        * w32.c (sys_close): Do not call delete_child on a subprocess
        whose handle is not yet closed.  Instead, set its file descriptor
        to a negative value, so that reap_subprocess will call
-       delete_child on that subprocess when its SIGCHLD arrives.  This
-       avoids closing handles used for communications between sys_select
+       delete_child on that subprocess when its SIGCHLD arrives.
+       This avoids closing handles used for communications between sys_select
        and reader_thread, which doesn't give sys_select a chance to
        notice that the process exited and invoke the SIGCHLD handler for
        it.

diff --git a/src/keyboard.c b/src/keyboard.c
index bc55eed1f5c0c5b7333452bd5c6331128c5df9af..14aecd00e90b7039cf3e3467f729fcefac52a223 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -502,7 +502,7 @@ kset_system_key_syms (struct kboard *kb, Lisp_Object val)
    printed.  */
 
 static void
-echo_add_char (Lisp_Object c)
+echo_add_key (Lisp_Object c)
 {
   int size = KEY_DESCRIPTION_SIZE + 100;
   char *buffer = alloca (size);
@@ -586,7 +586,7 @@ echo_char (Lisp_Object c)
 {
   if (current_kboard->immediate_echo)
     {
-      echo_add_char (c);
+      echo_add_key (c);
       echo_now ();
     }
 }
@@ -9227,7 +9227,7 @@ read_key_sequence (Lisp_Object *keybuf, int bufsize, Lisp_Object prompt,
              && NILP (Fzerop (Vecho_keystrokes))
              && current_kboard->immediate_echo)
            {
-             echo_add_char (key);
+             echo_add_key (key);
              echo_dash ();
            }
        }