automatically generated from GPLed version

[gnu-emacs] / src / xdisp.c

diff --git a/src/xdisp.c b/src/xdisp.c
index 65b4c2c26e8c58a81c281a77723d5f301553009d..d7c0bfe34bc3f9cb4da56167ea6afad7d11f3e40 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -418,7 +418,8 @@ message2_nolog (m, len)
       if (noninteractive_need_newline)
        putc ('\n', stderr);
       noninteractive_need_newline = 0;
-      fwrite (m, len, 1, stderr);
+      if (m)
+       fwrite (m, len, 1, stderr);
       if (cursor_in_echo_area == 0)
        fprintf (stderr, "\n");
       fflush (stderr);
@@ -4440,7 +4441,7 @@ decode_mode_spec (w, c, spec_width, maxwidth)
       /* coding-system (including end-of-line type) */
       {
        int eol_flag = (c == 'Z');
-       char *p;
+       char *p = decode_mode_spec_buf;
 
        if (FRAME_TERMCAP_P (f))
          {
@@ -4450,7 +4451,7 @@ decode_mode_spec (w, c, spec_width, maxwidth)
            p = decode_mode_spec_coding (terminal_coding.symbol, p, 0);
          }
        p = decode_mode_spec_coding (b->buffer_file_coding_system,
-                                    decode_mode_spec_buf, eol_flag);
+                                    p, eol_flag);
 
 #if 0 /* This proves to be annoying; I think we can do without.  -- rms.  */
 #ifdef subprocesses