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

Updated runtime files.

Browse Source
This commit is contained in:
Bram Moolenaar
2017-02-17 22:47:16 +01:00
parent 8c50d50b6e
commit 3df0173fa6
27 changed files with 745 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
runtime/doc/options.txt
View File

@ -1,4 +1,4 @@
*options.txt* For Vim version 8.0. Last change: 2017 Jan 28
*options.txt* For Vim version 8.0. Last change: 2017 Feb 09
VIM REFERENCE MANUAL by Bram Moolenaar
@ -2684,8 +2684,8 @@ A jump table for the options with a short description can be found at |Q_op|.
This option cannot be set from a |modeline|. It would most likely
corrupt the text.
NOTE: For GTK+ 2 it is highly recommended to set 'encoding' to
"utf-8". Although care has been taken to allow different values of
NOTE: For GTK+ 2 or later, it is highly recommended to set 'encoding'
to "utf-8". Although care has been taken to allow different values of
'encoding', "utf-8" is the natural choice for the environment and
avoids unnecessary conversion overhead. "utf-8" has not been made
the default to prevent different behavior of the GUI and terminal
@ -3596,6 +3596,14 @@ A jump table for the options with a short description can be found at |Q_op|.
On systems where 'guifontset' is supported (X11) and 'guifontset' is
not empty, then 'guifont' is not used.
Note: As to the GTK GUIs, no error is given against any invalid names,
and the first element of the list is always picked up and made use of.
This is because, instead of identifying a given name with a font, the
GTK GUIs use it to construct a pattern and try to look up a font which
best matches the pattern among available fonts, and this way, the
matching never fails. An invalid name doesn't matter because a number
of font properties other than name will do to get the matching done.
Spaces after a comma are ignored. To include a comma in a font name
precede it with a backslash. Setting an option requires an extra
backslash before a space and a backslash. See also
@ -3618,7 +3626,7 @@ A jump table for the options with a short description can be found at |Q_op|.
The font name depends on the GUI used. See |setting-guifont| for a
way to set 'guifont' for various systems.
For the GTK+ 2 GUI the font name looks like this: >
For the GTK+ 2 and 3 GUIs, the font name looks like this: >
:set guifont=Andale\ Mono\ 11
< That's all. XLFDs are not used. For Chinese this is reported to work
well: >
@ -3627,13 +3635,15 @@ A jump table for the options with a short description can be found at |Q_op|.
set guifontwide=Microsoft\ Yahei\ 12,WenQuanYi\ Zen\ Hei\ 12
endif
<
(Replace gui_gtk2 with gui_gtk3 for the GTK+ 3 GUI)
For Mac OSX you can use something like this: >
:set guifont=Monaco:h10
< Also see 'macatsui', it can help fix display problems.
*E236*
Note that the fonts must be mono-spaced (all characters have the same
width). An exception is GTK 2: all fonts are accepted, but
mono-spaced fonts look best.
width). An exception is GTK: all fonts are accepted, but mono-spaced
fonts look best.
To preview a font on X11, you might be able to use the "xfontsel"
program. The "xlsfonts" program gives a list of all available fonts.
@ -3671,7 +3681,7 @@ A jump table for the options with a short description can be found at |Q_op|.
{not in Vi}
{only available when compiled with GUI enabled and
with the |+xfontset| feature}
{not available in the GTK+ 2 GUI}
{not available in the GTK+ GUI}
When not empty, specifies two (or more) fonts to be used. The first
one for normal English, the second one for your special language. See
|xfontset|.
@ -3700,7 +3710,7 @@ A jump table for the options with a short description can be found at |Q_op|.
Note: The size of these fonts must be exactly twice as wide as the one
specified with 'guifont' and the same height.
All GUI versions but GTK+ 2:
All GUI versions but GTK+:
'guifontwide' is only used when 'encoding' is set to "utf-8" and
'guifontset' is empty or invalid.
@ -3708,7 +3718,7 @@ A jump table for the options with a short description can be found at |Q_op|.
'guifontwide' is empty Vim will attempt to find a matching
double-width font and set 'guifontwide' to it.
GTK+ 2 GUI only: *guifontwide_gtk2*
GTK+ GUI only: *guifontwide_gtk*
If set and valid, 'guifontwide' is always used for double width
characters, even if 'encoding' is not set to "utf-8".
@ -7606,7 +7616,7 @@ A jump table for the options with a short description can be found at |Q_op|.
For further details see |arabic.txt|.
*'termencoding'* *'tenc'*
'termencoding' 'tenc' string (default ""; with GTK+ 2 GUI: "utf-8"; with
'termencoding' 'tenc' string (default ""; with GTK+ GUI: "utf-8"; with
Macintosh GUI: "macroman")
global
{only available when compiled with the |+multi_byte|
@ -7618,7 +7628,7 @@ A jump table for the options with a short description can be found at |Q_op|.
display). Except for the Mac when 'macatsui' is off, then
'termencoding' should be "macroman".
*E617*
Note: This does not apply to the GTK+ 2 GUI. After the GUI has been
Note: This does not apply to the GTK+ GUI. After the GUI has been
successfully initialized, 'termencoding' is forcibly set to "utf-8".
Any attempts to set a different value will be rejected, and an error
message is shown.
@ -7901,7 +7911,7 @@ A jump table for the options with a short description can be found at |Q_op|.
'toolbariconsize' 'tbis' string (default "small")
global
{not in Vi}
{only in the GTK+ 2 GUI}
{only in the GTK+ GUI}
Controls the size of toolbar icons. The possible values are:
tiny Use tiny icons.
small Use small icons (default).