# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 868360333 0
# Node ID 7648eb8e46d2b57d8424476697a6b00580ec3126
# Parent  3980293d3bbd240eca965e293787b0e87448d862
(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 -r 3980293d3bbd -r 7648eb8e46d2 src/xdisp.c
--- a/src/xdisp.c	Tue Jul 08 09:57:37 1997 +0000
+++ b/src/xdisp.c	Tue Jul 08 11:12:13 1997 +0000
@@ -628,7 +628,8 @@
 		      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 @@
 	    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 @@
   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