* keyboard.c (Fcommand_error_default_function): Fix pointer signedness

glitch.  Eliminate 'sz' prefix; Hungarian notation is not helpful here.

2 files changed, 7 insertions, 4 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fec1a12de8a..740a8f93505 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-05  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * keyboard.c (Fcommand_error_default_function): Fix pointer signedness
+        glitch.  Eliminate 'sz' prefix; Hungarian notation is not helpful here.
+
 2013-11-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * keyboard.c (Fcommand_error_default_function): Rename from
diff --git a/src/keyboard.c b/src/keyboard.c
index 574780e2004..9dba631986b 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1088,10 +1088,8 @@ Default value of `command-error-function'.  */)
   (Lisp_Object data, Lisp_Object context, Lisp_Object signal)
 {
   struct frame *sf = SELECTED_FRAME ();
-  const char *sz_context;
 
   CHECK_STRING (context);
-  sz_context = XSTRING (context)->data;
 
   /* If the window system or terminal frame hasn't been initialized
      yet, or we're not interactive, write the message to stderr and exit.  */
@@ -1110,7 +1108,7 @@ Default value of `command-error-function'.  */)
            || noninteractive)
     {
       print_error_message (data, Qexternal_debugging_output,
-                           sz_context, signal);
+                           SSDATA (context), signal);
       Fterpri (Qexternal_debugging_output);
       Fkill_emacs (make_number (-1));
     }
@@ -1121,7 +1119,7 @@ Default value of `command-error-function'.  */)
       message_log_maybe_newline ();
       bitch_at_user ();
 
-      print_error_message (data, Qt, sz_context, signal);
+      print_error_message (data, Qt, SSDATA (context), signal);
     }
   return Qnil;
 }