adam/vim
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disallow setting 'ambiwidth' to "double" when 'listchars' or 'fillchars'

Browse Source 
contains a character that would become double width.
This commit is contained in:
Bram Moolenaar
2010-08-04 20:55:44 +02:00
parent e4ce65d445
commit 5c3bd0a0fb
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/doc/options.txt
View File

@ -1,4 +1,4 @@
*options.txt* For Vim version 7.3e. Last change: 2010 Aug 01 *options.txt* For Vim version 7.3e. Last change: 2010 Aug 04
VIM REFERENCE MANUAL by Bram Moolenaar VIM REFERENCE MANUAL by Bram Moolenaar
@ -665,6 +665,9 @@ A jump table for the options with a short description can be found at |Q_op|.
"single": Use the same width as characters in US-ASCII. This is "single": Use the same width as characters in US-ASCII. This is
expected by most users. expected by most users.
"double": Use twice the width of ASCII characters. "double": Use twice the width of ASCII characters.
*E834* *E835*
The value "double" cannot be used if 'listchars' or 'fillchars'
contains a character that would be double width.
There are a number of CJK fonts for which the width of glyphs for There are a number of CJK fonts for which the width of glyphs for
those characters are solely based on how many octets they take in those characters are solely based on how many octets they take in

6
src/option.c
View File

@ -5745,6 +5745,12 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
{ {
if (check_opt_strings(p_ambw, p_ambw_values, FALSE) != OK) if (check_opt_strings(p_ambw, p_ambw_values, FALSE) != OK)
errmsg = e_invarg; errmsg = e_invarg;
else if (set_chars_option(&p_lcs) != NULL)
errmsg = (char_u *)_("E834: Conflicts with value of 'listchars'");
# if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING)
else if (set_chars_option(&p_fcs) != NULL)
errmsg = (char_u *)_("E835: Conflicts with value of 'fillchars'");
# endif
} }
#endif #endif