diff options
| author | Chong Yidong | 2012-06-03 18:23:49 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-06-03 18:23:49 +0800 |
| commit | 383f7350f34707d317e169c203d3c6efb27ee46c (patch) | |
| tree | e8167e326e325b1f4451b5f0d3929dd0708ac5d2 /src | |
| parent | 1c476a0a7ffcbad019480b9057c17501c445eefb (diff) | |
| download | emacs-383f7350f34707d317e169c203d3c6efb27ee46c.tar.gz emacs-383f7350f34707d317e169c203d3c6efb27ee46c.zip | |
Make mode line help-echo visible for unibyte buffers.
* src/xdisp.c (decode_mode_spec_coding): Display a space for a unibyte
buffer.
* lisp/bindings.el (mode-line-mule-info-help-echo)
(mode-line-read-only-help-echo, mode-line-modified-help-echo):
New functions.
(mode-line-mule-info, mode-line-modified): Use them.
(mode-line-eol-desc, propertized-buffer-identification):
Consistency fixes for help text.
Fixes: debbugs:11226
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 5 | ||||
| -rw-r--r-- | src/xdisp.c | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c0098445cb8..4eaf2d49f36 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2012-06-03 Chong Yidong <cyd@gnu.org> | 1 | 2012-06-03 Chong Yidong <cyd@gnu.org> |
| 2 | 2 | ||
| 3 | * xdisp.c (decode_mode_spec_coding): Display a space for a unibyte | ||
| 4 | buffer (Bug#11226). | ||
| 5 | |||
| 6 | 2012-06-03 Chong Yidong <cyd@gnu.org> | ||
| 7 | |||
| 3 | * xdisp.c (calc_pixel_width_or_height): Use Fbuffer_local_value. | 8 | * xdisp.c (calc_pixel_width_or_height): Use Fbuffer_local_value. |
| 4 | (note_mode_line_or_margin_highlight): If there is no help echo, | 9 | (note_mode_line_or_margin_highlight): If there is no help echo, |
| 5 | use mode-line-default-help-echo. Handle the case where the mouse | 10 | use mode-line-default-help-echo. Handle the case where the mouse |
diff --git a/src/xdisp.c b/src/xdisp.c index 8a1d83dc8e6..f01c86b2a07 100644 --- a/src/xdisp.c +++ b/src/xdisp.c | |||
| @@ -21012,8 +21012,7 @@ decode_mode_spec_coding (Lisp_Object coding_system, register char *buf, int eol_ | |||
| 21012 | 21012 | ||
| 21013 | if (!VECTORP (val)) /* Not yet decided. */ | 21013 | if (!VECTORP (val)) /* Not yet decided. */ |
| 21014 | { | 21014 | { |
| 21015 | if (multibyte) | 21015 | *buf++ = multibyte ? '-' : ' '; |
| 21016 | *buf++ = '-'; | ||
| 21017 | if (eol_flag) | 21016 | if (eol_flag) |
| 21018 | eoltype = eol_mnemonic_undecided; | 21017 | eoltype = eol_mnemonic_undecided; |
| 21019 | /* Don't mention EOL conversion if it isn't decided. */ | 21018 | /* Don't mention EOL conversion if it isn't decided. */ |
| @@ -21026,8 +21025,9 @@ decode_mode_spec_coding (Lisp_Object coding_system, register char *buf, int eol_ | |||
| 21026 | attrs = AREF (val, 0); | 21025 | attrs = AREF (val, 0); |
| 21027 | eolvalue = AREF (val, 2); | 21026 | eolvalue = AREF (val, 2); |
| 21028 | 21027 | ||
| 21029 | if (multibyte) | 21028 | *buf++ = multibyte |
| 21030 | *buf++ = XFASTINT (CODING_ATTR_MNEMONIC (attrs)); | 21029 | ? XFASTINT (CODING_ATTR_MNEMONIC (attrs)) |
| 21030 | : ' '; | ||
| 21031 | 21031 | ||
| 21032 | if (eol_flag) | 21032 | if (eol_flag) |
| 21033 | { | 21033 | { |