(decode_mode_spec_coding): Really don't display

EOL indicator when eol_flag is 0.
(echo_area_display): Use proper width when scroll bars on left.

diff --git a/src/xdisp.c b/src/xdisp.c
index cb45b92b3e596ab0ec69593394450e39dbd2489c..8260c83a5c42ccf0591212517637cd701dc99f16 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -628,7 +628,8 @@ echo_area_display ()
                      echo_area_glyphs ? echo_area_glyphs : "",
                      echo_area_glyphs ? echo_area_glyphs_length : -1,
                      FRAME_LEFT_SCROLL_BAR_WIDTH (f),
-                     0, 0, 0, FRAME_WIDTH (f));
+                     0, 0, 0,
+                     FRAME_WIDTH (f) + FRAME_LEFT_SCROLL_BAR_WIDTH (f));
 
 #if 0 /* This just gets in the way.  update_frame does the job.  */
       /* If desired cursor location is on this line, put it at end of text */
@@ -649,7 +650,8 @@ echo_area_display ()
            display_string (XWINDOW (mini_window), i,
                            "", 0, 
                             FRAME_LEFT_SCROLL_BAR_WIDTH (f),
-                           0, 0, 0, FRAME_WIDTH (f));
+                           0, 0, 0,
+                           FRAME_WIDTH (f) + FRAME_LEFT_SCROLL_BAR_WIDTH (f));
          }
       }
     }
@@ -4057,7 +4059,8 @@ decode_mode_spec_coding (coding_system, buf, eol_flag)
   if (NILP (val))              /* Not yet decided.  */
     {
       *buf++ = '-';
-      *buf++ = eol_mnemonic_undecided;
+      if (eol_flag)
+       *buf++ = eol_mnemonic_undecided;
       /* Don't mention EOL conversion if it isn't decided.  */
     }
   else