Mercurial > emacs
changeset 18677:7648eb8e46d2
(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.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Tue, 08 Jul 1997 11:12:13 +0000 |
| parents | 3980293d3bbd |
| children | d26f9720e55f |
| files | src/xdisp.c |
| diffstat | 1 files changed, 6 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- 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