Skip to content

Commit 3df0173

Browse files
committed
Updated runtime files.
1 parent 8c50d50 commit 3df0173

27 files changed

+741
-545
lines changed

runtime/autoload/ada.vim

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,13 @@
22
" Description: Perform Ada specific completion & tagging.
33
" Language: Ada (2005)
44
" $Id: ada.vim 887 2008-07-08 14:29:01Z krischik $
5-
" Maintainer: Martin Krischik <[email protected]>
5+
" Maintainer: Mathias Brousset <[email protected]>
6+
" Martin Krischik <[email protected]>
67
" Taylor Venable <[email protected]>
78
" Neil Bird <[email protected]>
89
" Ned Okie <[email protected]>
910
" $Author: krischik $
10-
" $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
11+
" $Date: 2017-01-31 20:20:05 +0200 (Mon, 01 Jan 2017) $
1112
" Version: 4.6
1213
" $Revision: 887 $
1314
" $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
@@ -23,6 +24,7 @@
2324
" 09.05.2007 MK Session just won't work no matter how much
2425
" tweaking is done
2526
" 19.09.2007 NO still some mapleader problems
27+
" 31.01.2017 MB fix more mapleader problems
2628
" Help Page: ft-ada-functions
2729
"------------------------------------------------------------------------------
2830

@@ -447,7 +449,7 @@ function ada#Switch_Session (New_Session)
447449

448450
if a:New_Session != v:this_session
449451
"
450-
" We actualy got a new session - otherwise there
452+
" We actually got a new session - otherwise there
451453
" is nothing to do.
452454
"
453455
if strlen (v:this_session) > 0
@@ -585,11 +587,11 @@ function ada#Map_Menu (Text, Keys, Command)
585587
\ " :" . a:Command . "<CR>"
586588
execute
587589
\ "nnoremap <buffer>" .
588-
\ escape(l:leader . "a" . a:Keys , '\') .
590+
\ " <Leader>a" . a:Keys .
589591
\" :" . a:Command
590592
execute
591593
\ "inoremap <buffer>" .
592-
\ escape(l:leader . "a" . a:Keys , '\') .
594+
\ " <Learder>a" . a:Keys .
593595
\" <C-O>:" . a:Command
594596
endif
595597
return

runtime/doc/change.txt

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*change.txt* For Vim version 8.0. Last change: 2016 Nov 19
1+
*change.txt* For Vim version 8.0. Last change: 2017 Feb 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -635,12 +635,14 @@ For other systems the tmpnam() library function is used.
635635
For the {pattern} see |pattern|.
636636
{string} can be a literal string, or something
637637
special; see |sub-replace-special|.
638+
*E939*
638639
When [range] and [count] are omitted, replace in the
639-
current line only.
640-
When [count] is given, replace in [count] lines,
641-
starting with the last line in [range]. When [range]
642-
is omitted start in the current line.
643-
Also see |cmdline-ranges|.
640+
current line only. When [count] is given, replace in
641+
[count] lines, starting with the last line in [range].
642+
When [range] is omitted start in the current line.
643+
[count] must be a positive number. Also see
644+
|cmdline-ranges|.
645+
644646
See |:s_flags| for [flags].
645647

646648
:[range]s[ubstitute] [flags] [count]

runtime/doc/diff.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*diff.txt* For Vim version 8.0. Last change: 2016 Aug 24
1+
*diff.txt* For Vim version 8.0. Last change: 2017 Feb 03
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -131,6 +131,8 @@ file for a moment and come back to the same file and be in diff mode again.
131131
related options only happens in a window that has 'diff' set,
132132
if the current window does not have 'diff' set then no options
133133
in it are changed.
134+
Hidden buffers are also removed from the list of diff'ed
135+
buffers.
134136

135137
The `:diffoff` command resets the relevant options to the values they had when
136138
using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode.
@@ -164,7 +166,8 @@ The alignment of text will go wrong when:
164166

165167
All the buffers edited in a window where the 'diff' option is set will join in
166168
the diff. This is also possible for hidden buffers. They must have been
167-
edited in a window first for this to be possible.
169+
edited in a window first for this to be possible. To get rid of the hidden
170+
buffers use `:diffoff!`.
168171

169172
*:DiffOrig* *diff-original-file*
170173
Since 'diff' is a window-local option, it's possible to view the same buffer

runtime/doc/eval.txt

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*eval.txt* For Vim version 8.0. Last change: 2017 Jan 28
1+
*eval.txt* For Vim version 8.0. Last change: 2017 Feb 17
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1329,7 +1329,8 @@ b:changedtick The total number of changes to the current buffer. It is
13291329
: let my_changedtick = b:changedtick
13301330
: call My_Update()
13311331
:endif
1332-
<
1332+
< You cannot change or delete the b:changedtick variable.
1333+
13331334
*window-variable* *w:var* *w:*
13341335
A variable name that is preceded with "w:" is local to the current window. It
13351336
is deleted when the window is closed.
@@ -4371,8 +4372,8 @@ getfontname([{name}]) *getfontname()*
43714372
Only works when the GUI is running, thus not in your vimrc or
43724373
gvimrc file. Use the |GUIEnter| autocommand to use this
43734374
function just after the GUI has started.
4374-
Note that the GTK 2 GUI accepts any font name, thus checking
4375-
for a valid name does not work.
4375+
Note that the GTK GUI accepts any font name, thus checking for
4376+
a valid name does not work.
43764377

43774378
getfperm({fname}) *getfperm()*
43784379
The result is a String, which is the read, write, and execute
@@ -5978,7 +5979,7 @@ printf({fmt}, {expr1} ...) *printf()*
59785979
%e floating point number as 1.23e3, inf, -inf or nan
59795980
%E floating point number as 1.23E3, INF, -INF or NAN
59805981
%g floating point number, as %f or %e depending on value
5981-
%G floating point number, as %f or %E depending on value
5982+
%G floating point number, as %F or %E depending on value
59825983
%% the % character itself
59835984

59845985
Conversion specifications start with '%' and end with the
@@ -7807,6 +7808,8 @@ test_settime({expr}) *test_settime()*
78077808
Set the time Vim uses internally. Currently only used for
78087809
timestamps in the history, as they are used in viminfo, and
78097810
for undo.
7811+
Using a value of 1 makes Vim not sleep after a warning or
7812+
error message.
78107813
{expr} must evaluate to a number. When the value is zero the
78117814
normal behavior is restored.
78127815

@@ -8463,6 +8466,7 @@ toolbar Compiled with support for |gui-toolbar|.
84638466
ttyin input is a terminal (tty)
84648467
ttyout output is a terminal (tty)
84658468
unix Unix version of Vim.
8469+
unnamedplus Compiled with support for "unnamedplus" in 'clipboard'
84668470
user_commands User-defined commands.
84678471
vertsplit Compiled with vertically split windows |:vsplit|.
84688472
vim_starting True while initial source'ing takes place. |startup|
@@ -8966,6 +8970,11 @@ This does NOT work: >
89668970
value and the global value are changed.
89678971
Example: >
89688972
:let &path = &path . ',/usr/local/include'
8973+
< This also works for terminal codes in the form t_xx.
8974+
But only for alphanumerical names. Example: >
8975+
:let &t_k1 = "\<Esc>[234;"
8976+
< When the code does not exist yet it will be created as
8977+
a terminal key code, there is no error.
89698978

89708979
:let &{option-name} .= {expr1}
89718980
For a string option: Append {expr1} to the value.

runtime/doc/helphelp.txt

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*helphelp.txt* For Vim version 8.0. Last change: 2016 Apr 01
1+
*helphelp.txt* For Vim version 8.0. Last change: 2017 Feb 09
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -28,10 +28,16 @@ Help on help files *helphelp*
2828

2929
*{subject}* *E149* *E661*
3030
:h[elp] {subject} Like ":help", additionally jump to the tag {subject}.
31-
{subject} can include wildcards like "*", "?" and
31+
For example: >
32+
:help options
33+
34+
< {subject} can include wildcards such as "*", "?" and
3235
"[a-z]":
3336
:help z? jump to help for any "z" command
3437
:help z. jump to the help for "z."
38+
But when a tag exists it is taken literally:
39+
:help :? jump to help for ":?"
40+
3541
If there is no full match for the pattern, or there
3642
are several matches, the "best" match will be used.
3743
A sophisticated algorithm is used to decide which
@@ -68,18 +74,19 @@ Help on help files *helphelp*
6874
example to find help for CTRL-V in Insert mode: >
6975
:help i^V
7076
<
71-
To use a regexp |pattern|, first do ":help" and then
77+
It is also possible to first do ":help" and then
7278
use ":tag {pattern}" in the help window. The
7379
":tnext" command can then be used to jump to other
7480
matches, "tselect" to list matches and choose one. >
75-
:help index| :tse z.
81+
:help index
82+
:tselect /.*mode
7683
7784
< When there is no argument you will see matches for
7885
"help", to avoid listing all possible matches (that
7986
would be very slow).
8087
The number of matches displayed is limited to 300.
8188

82-
This command can be followed by '|' and another
89+
The `:help` command can be followed by '|' and another
8390
command, but you don't need to escape the '|' inside a
8491
help command. So these both work: >
8592
:help |

runtime/doc/if_pyth.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*if_pyth.txt* For Vim version 8.0. Last change: 2017 Jan 28
1+
*if_pyth.txt* For Vim version 8.0. Last change: 2017 Feb 17
22

33

44
VIM REFERENCE MANUAL by Paul Moore
@@ -731,9 +731,11 @@ To use the Python interface the Python DLL must be in your search path. In a
731731
console window type "path" to see what directories are used. The 'pythondll'
732732
or 'pythonthreedll' option can be also used to specify the Python DLL.
733733

734-
The name of the DLL must match the Python version Vim was compiled with.
735-
Currently the name is "python24.dll". That is for Python 2.4. To know for
736-
sure edit "gvim.exe" and search for "python\d*.dll\c".
734+
The name of the DLL should match the Python version Vim was compiled with.
735+
Currently the name for Python 2 is "python27.dll", that is for Python 2.7.
736+
That is the default value for 'pythondll'. For Python 3 it is python35.dll
737+
(Python 3.5). To know for sure edit "gvim.exe" and search for
738+
"python\d*.dll\c".
737739

738740

739741
Unix ~

runtime/doc/options.txt

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.0. Last change: 2017 Jan 28
1+
*options.txt* For Vim version 8.0. Last change: 2017 Feb 09
22

33

44
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|.
26842684
This option cannot be set from a |modeline|. It would most likely
26852685
corrupt the text.
26862686

2687-
NOTE: For GTK+ 2 it is highly recommended to set 'encoding' to
2688-
"utf-8". Although care has been taken to allow different values of
2687+
NOTE: For GTK+ 2 or later, it is highly recommended to set 'encoding'
2688+
to "utf-8". Although care has been taken to allow different values of
26892689
'encoding', "utf-8" is the natural choice for the environment and
26902690
avoids unnecessary conversion overhead. "utf-8" has not been made
26912691
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|.
35963596
On systems where 'guifontset' is supported (X11) and 'guifontset' is
35973597
not empty, then 'guifont' is not used.
35983598

3599+
Note: As to the GTK GUIs, no error is given against any invalid names,
3600+
and the first element of the list is always picked up and made use of.
3601+
This is because, instead of identifying a given name with a font, the
3602+
GTK GUIs use it to construct a pattern and try to look up a font which
3603+
best matches the pattern among available fonts, and this way, the
3604+
matching never fails. An invalid name doesn't matter because a number
3605+
of font properties other than name will do to get the matching done.
3606+
35993607
Spaces after a comma are ignored. To include a comma in a font name
36003608
precede it with a backslash. Setting an option requires an extra
36013609
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|.
36183626
The font name depends on the GUI used. See |setting-guifont| for a
36193627
way to set 'guifont' for various systems.
36203628

3621-
For the GTK+ 2 GUI the font name looks like this: >
3629+
For the GTK+ 2 and 3 GUIs, the font name looks like this: >
36223630
:set guifont=Andale\ Mono\ 11
36233631
< That's all. XLFDs are not used. For Chinese this is reported to work
36243632
well: >
@@ -3627,13 +3635,15 @@ A jump table for the options with a short description can be found at |Q_op|.
36273635
set guifontwide=Microsoft\ Yahei\ 12,WenQuanYi\ Zen\ Hei\ 12
36283636
endif
36293637
<
3638+
(Replace gui_gtk2 with gui_gtk3 for the GTK+ 3 GUI)
3639+
36303640
For Mac OSX you can use something like this: >
36313641
:set guifont=Monaco:h10
36323642
< Also see 'macatsui', it can help fix display problems.
36333643
*E236*
36343644
Note that the fonts must be mono-spaced (all characters have the same
3635-
width). An exception is GTK 2: all fonts are accepted, but
3636-
mono-spaced fonts look best.
3645+
width). An exception is GTK: all fonts are accepted, but mono-spaced
3646+
fonts look best.
36373647

36383648
To preview a font on X11, you might be able to use the "xfontsel"
36393649
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|.
36713681
{not in Vi}
36723682
{only available when compiled with GUI enabled and
36733683
with the |+xfontset| feature}
3674-
{not available in the GTK+ 2 GUI}
3684+
{not available in the GTK+ GUI}
36753685
When not empty, specifies two (or more) fonts to be used. The first
36763686
one for normal English, the second one for your special language. See
36773687
|xfontset|.
@@ -3700,15 +3710,15 @@ A jump table for the options with a short description can be found at |Q_op|.
37003710
Note: The size of these fonts must be exactly twice as wide as the one
37013711
specified with 'guifont' and the same height.
37023712

3703-
All GUI versions but GTK+ 2:
3713+
All GUI versions but GTK+:
37043714

37053715
'guifontwide' is only used when 'encoding' is set to "utf-8" and
37063716
'guifontset' is empty or invalid.
37073717
When 'guifont' is set and a valid font is found in it and
37083718
'guifontwide' is empty Vim will attempt to find a matching
37093719
double-width font and set 'guifontwide' to it.
37103720

3711-
GTK+ 2 GUI only: *guifontwide_gtk2*
3721+
GTK+ GUI only: *guifontwide_gtk*
37123722

37133723
If set and valid, 'guifontwide' is always used for double width
37143724
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|.
76067616
For further details see |arabic.txt|.
76077617

76087618
*'termencoding'* *'tenc'*
7609-
'termencoding' 'tenc' string (default ""; with GTK+ 2 GUI: "utf-8"; with
7619+
'termencoding' 'tenc' string (default ""; with GTK+ GUI: "utf-8"; with
76107620
Macintosh GUI: "macroman")
76117621
global
76127622
{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|.
76187628
display). Except for the Mac when 'macatsui' is off, then
76197629
'termencoding' should be "macroman".
76207630
*E617*
7621-
Note: This does not apply to the GTK+ 2 GUI. After the GUI has been
7631+
Note: This does not apply to the GTK+ GUI. After the GUI has been
76227632
successfully initialized, 'termencoding' is forcibly set to "utf-8".
76237633
Any attempts to set a different value will be rejected, and an error
76247634
message is shown.
@@ -7901,7 +7911,7 @@ A jump table for the options with a short description can be found at |Q_op|.
79017911
'toolbariconsize' 'tbis' string (default "small")
79027912
global
79037913
{not in Vi}
7904-
{only in the GTK+ 2 GUI}
7914+
{only in the GTK+ GUI}
79057915
Controls the size of toolbar icons. The possible values are:
79067916
tiny Use tiny icons.
79077917
small Use small icons (default).

runtime/doc/repeat.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*repeat.txt* For Vim version 8.0. Last change: 2016 Sep 11
1+
*repeat.txt* For Vim version 8.0. Last change: 2017 Feb 06
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -305,6 +305,11 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|.
305305
Mark) in utf-8 format Vim will recognize it, no need
306306
to use ":scriptencoding utf-8" then.
307307

308+
If you set the 'encoding' option in your |.vimrc|,
309+
`:scriptencoding` must be placed after that. E.g.: >
310+
set encoding=utf-8
311+
scriptencoding utf-8
312+
<
308313
When compiled without the |+multi_byte| feature this
309314
command is ignored.
310315
{not in Vi}

0 commit comments

Comments
 (0)