Skip to content

Commit 85084ef

Browse files
committed
Update help files.
1 parent 203258c commit 85084ef

File tree

7 files changed

+75
-85
lines changed

7 files changed

+75
-85
lines changed

runtime/doc/editing.txt

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*editing.txt* For Vim version 7.4. Last change: 2016 Jan 03
1+
*editing.txt* For Vim version 7.4. Last change: 2016 Jan 17
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -639,6 +639,7 @@ list of the current window.
639639
:0argadd x x a b c
640640
:1argadd x a x b c
641641
:$argadd x a b c x
642+
And after the last one:
642643
:+2argadd y a b c x y
643644
There is no check for duplicates, it is possible to
644645
add a file to the argument list twice.
@@ -1458,6 +1459,16 @@ using zip, "[blowfish]" when using blowfish, etc.
14581459
When writing an undo file, the same key and method will be used for the text
14591460
in the undo file. |persistent-undo|.
14601461

1462+
To test for blowfish support you can use these conditions: >
1463+
has('crypt-blowfish')
1464+
has('crypt-blowfish2')
1465+
This works since Vim 7.4.1099 while blowfish support was added earlier.
1466+
Thus the condition failing doesn't mean blowfish is not supported. You can
1467+
test for blowfish with: >
1468+
v:version >= 703
1469+
And for blowfish2 with: >
1470+
v:version > 704 || (v:version == 704 && has('patch401'))
1471+
<
14611472
*E817* *E818* *E819* *E820*
14621473
When encryption does not work properly, you would be able to write your text
14631474
to a file and never be able to read it back. Therefore a test is performed to

runtime/doc/eval.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -873,7 +873,7 @@ cursor: >
873873
:let c = getline(".")[col(".") - 1]
874874
875875
If the length of the String is less than the index, the result is an empty
876-
String. A negative index always results in an empty string (reason: backwards
876+
String. A negative index always results in an empty string (reason: backward
877877
compatibility). Use [-1:] to get the last byte.
878878

879879
If expr8 is a |List| then it results the item at index expr1. See |list-index|
@@ -4563,8 +4563,8 @@ matchadd({group}, {pattern}[, {priority}[, {id} [, {dict}]]])
45634563
respectively. If the {id} argument is not specified or -1,
45644564
|matchadd()| automatically chooses a free ID.
45654565

4566-
The optional {dict} argmument allows for further custom
4567-
values. Currently this is used to specify a match specifc
4566+
The optional {dict} argument allows for further custom
4567+
values. Currently this is used to specify a match specific
45684568
conceal character that will be shown for |hl-Conceal|
45694569
highlighted matches. The dict can have the following members:
45704570

@@ -4797,9 +4797,9 @@ pathshorten({expr}) *pathshorten()*
47974797
perleval({expr}) *perleval()*
47984798
Evaluate Perl expression {expr} in scalar context and return
47994799
its result converted to Vim data structures. If value can't be
4800-
converted, it returned as string Perl representation.
4801-
Note: If you want a array or hash, {expr} must returns an
4802-
reference of it.
4800+
converted, it is returned as a string Perl representation.
4801+
Note: If you want an array or hash, {expr} must return a
4802+
reference to it.
48034803
Example: >
48044804
:echo perleval('[1 .. 4]')
48054805
< [1, 2, 3, 4]
@@ -5319,7 +5319,7 @@ search({pattern} [, {flags} [, {stopline} [, {timeout}]]]) *search()*
53195319

53205320
'ignorecase', 'smartcase' and 'magic' are used.
53215321

5322-
When the 'z' flag is not given seaching always starts in
5322+
When the 'z' flag is not given, searching always starts in
53235323
column zero and then matches before the cursor are skipped.
53245324
When the 'c' flag is present in 'cpo' the next search starts
53255325
after the match. Without the 'c' flag the next search starts
@@ -7681,7 +7681,7 @@ This does NOT work: >
76817681
From Vim version 4.5 until 5.0, every Ex command in
76827682
between the ":if" and ":endif" is ignored. These two
76837683
commands were just to allow for future expansions in a
7684-
backwards compatible way. Nesting was allowed. Note
7684+
backward compatible way. Nesting was allowed. Note
76857685
that any ":else" or ":elseif" was ignored, the "else"
76867686
part was not executed either.
76877687

runtime/doc/if_mzsch.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*if_mzsch.txt* For Vim version 7.4. Last change: 2012 Dec 17
1+
*if_mzsch.txt* For Vim version 7.4. Last change: 2016 Jan 16
22

33

44
VIM REFERENCE MANUAL by Sergey Khorev

runtime/doc/mlang.txt

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*mlang.txt* For Vim version 7.4. Last change: 2012 Jan 15
1+
*mlang.txt* For Vim version 7.4. Last change: 2016 Jan 16
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -97,13 +97,15 @@ If you used the self-installing .exe file, message translations should work
9797
already. Otherwise get the libintl.dll file if you don't have it yet:
9898

9999
http://sourceforge.net/projects/gettext
100+
Or:
101+
https://mlocati.github.io/gettext-iconv-windows/
100102

101103
This also contains tools xgettext, msgformat and others.
102104

103105
libintl.dll should be placed in same directory with (g)vim.exe, or some
104-
place where PATH environment value describe. Message files (vim.mo)
105-
have to be placed in "$VIMRUNTIME/lang/xx/LC_MESSAGES", where "xx" is the
106-
abbreviation of the language (mostly two letters).
106+
place where PATH environment value describe. Vim also finds libintl-8.dll.
107+
Message files (vim.mo) have to be placed in "$VIMRUNTIME/lang/xx/LC_MESSAGES",
108+
where "xx" is the abbreviation of the language (mostly two letters).
107109

108110
If you write your own translations you need to generate the .po file and
109111
convert it to a .mo file. You need to get the source distribution and read

runtime/doc/tags

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3367,12 +3367,18 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
33673367
== change.txt /*==*
33683368
> change.txt /*>*
33693369
>> change.txt /*>>*
3370+
>backtrace repeat.txt /*>backtrace*
3371+
>bt repeat.txt /*>bt*
33703372
>cont repeat.txt /*>cont*
3373+
>down repeat.txt /*>down*
33713374
>finish repeat.txt /*>finish*
3375+
>frame repeat.txt /*>frame*
33723376
>interrupt repeat.txt /*>interrupt*
33733377
>next repeat.txt /*>next*
33743378
>quit repeat.txt /*>quit*
33753379
>step repeat.txt /*>step*
3380+
>up repeat.txt /*>up*
3381+
>where repeat.txt /*>where*
33763382
? pattern.txt /*?*
33773383
?<CR> pattern.txt /*?<CR>*
33783384
@ repeat.txt /*@*
@@ -7086,6 +7092,7 @@ mzscheme-examples if_mzsch.txt /*mzscheme-examples*
70867092
mzscheme-funcref if_mzsch.txt /*mzscheme-funcref*
70877093
mzscheme-mzeval if_mzsch.txt /*mzscheme-mzeval*
70887094
mzscheme-sandbox if_mzsch.txt /*mzscheme-sandbox*
7095+
mzscheme-setup if_mzsch.txt /*mzscheme-setup*
70897096
mzscheme-threads if_mzsch.txt /*mzscheme-threads*
70907097
mzscheme-vim if_mzsch.txt /*mzscheme-vim*
70917098
mzscheme-vimext if_mzsch.txt /*mzscheme-vimext*
@@ -7531,6 +7538,7 @@ perl-overview if_perl.txt /*perl-overview*
75317538
perl-patterns pattern.txt /*perl-patterns*
75327539
perl-using if_perl.txt /*perl-using*
75337540
perl.vim syntax.txt /*perl.vim*
7541+
perleval() eval.txt /*perleval()*
75347542
persistent-undo undo.txt /*persistent-undo*
75357543
pexpr-option print.txt /*pexpr-option*
75367544
pfn-option print.txt /*pfn-option*

runtime/doc/todo.txt

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 7.4. Last change: 2016 Jan 15
1+
*todo.txt* For Vim version 7.4. Last change: 2016 Jan 17
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -97,8 +97,6 @@ Should use /usr/local/share/applications or /usr/share/applications.
9797
Or use $XDG_DATA_DIRS.
9898
Also need to run update-desktop-database (Kuriyama Kazunobu, 2015 Nov 4)
9999

100-
Add has('crypt-blowfish') and has('crypt-blowfish2') (Smu Johnson)
101-
102100
Access to uninitialized memory in match_backref() regexp_nda.c:4882
103101
(Dominique Pelle, 2015 Nov 6)
104102

@@ -125,42 +123,16 @@ github with a URL like this:
125123
https://github.com/vim/vim/compare/v7.4.920%5E...v7.4.920.diff
126124
Diff for version.c contains more context, can't skip a patch.
127125
>
128-
Can src/GvimExt/Make_cyg.mak be removed?
129-
Same for src/xxd/Make_cyg.mak
130-
131126
When t_Co is changed from termresponse, the OptionSet autocmmand event isn't
132127
triggered. Use the code from the end of set_num_option() in
133128
set_color_count().
134129

135130
Python: ":py raw_input('prompt')" doesn't work. (Manu Hack)
136131

137-
Patch to fix cursor position in right-left mode with concealing.
138-
(Hirohito Higashi, 2016 Jan 13)
139-
140132
Plugin to use Vim in MANPAGER. Konfekt, PR #491
141133

142134
Using uninitialized memory. (Dominique Pelle, 2015 Nov 4)
143135

144-
Patch for explaining the help. (Christian Brabandt, 2015 Jan 8)
145-
Should be in the user manual?
146-
147-
Patch to recognize string slice for variable followed by colon.
148-
(Hirohito Higashi, 2015 Nov 24)
149-
150-
Patch to add debug backtrace. (Alberto Fanjul, 2015 Sep 27)
151-
Update 2016 Jan 2. Issue #433
152-
153-
Patch to gvim.nsi for appveyor build. (Ken Takata, 2016 Jan 12)
154-
155-
Patch to improve behavior of dead keys on MS-Windows. (John Wellesz, 2015 Aug
156-
25) https://github.com/vim/vim/pull/399.diff
157-
158-
Patch to make mzscheme (racket) interface work. (Yukihiro Nakadaira, 2015 Jan
159-
10) Doesn't work for me, need to build from source. Include anyway?
160-
Additional patch by Ken Takata, 2016 Jan 13.
161-
Merged patch by Yasuhiro Nakadaira,, 2016 Jan 14.
162-
Update for INSSTALLpc.txt by Ken Takata, Jan 14.
163-
164136
MS-Windows: When editing a file with a leading space, writing it uses the
165137
wrong name. (Aram, 2014 Nov 7) Vim 7.4.
166138

@@ -171,19 +143,12 @@ Half-finished patch to fix the Problem using cgn to change a search hit when
171143
replacement includes hit. Reported by John Beckett, fix by Christian Brabandt,
172144
2016 Jan 11.
173145

174-
Patch to fix pointer cast warning in VS2015. (Mike Williams, 2015 Dec 13)
175-
Patch to make building GVimExt with VS2015. (Mike Williams, 2015 Dec 13)
176-
177146
Value returned by virtcol() changes depending on how lines wrap. This is
178147
inconsistent with the documentation.
179148

180-
Patch to add perleval(). (Damien, 2015 Dec 8, update 2016 Jan 4)
181-
182149
Can we cache the syntax attributes, so that updates for 'relativenumber' and
183150
'cursorline'/'cursorcolumn' are a lot faster?
184151

185-
Patch to add window and tab arguments to getcwd(). (Thinca, 2015 Nov 15)
186-
187152
Build with Python on Mac does not always use the right library.
188153
(Kazunobu Kuriyama, 2015 Mar 28)
189154

@@ -286,7 +251,7 @@ Is this the right solution? Need to cleanup langmap behavior:
286251
- Remove LANGMAP_ADJUST() in other parts of the code. Make sure the mode is
287252
covered by the above change.
288253
So that replaying the register doesn't use keymap/langmap and still does the
289-
same thing. Remarks on issue 543.
254+
same thing. Remarks on issue 543 (Roland Puntaier).
290255

291256
Patch to add grepfile(). (Scott Prager, 2015 May 26)
292257
Work in progress.

runtime/doc/usr_02.txt

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*usr_02.txt* For Vim version 7.4. Last change: 2016 Jan 15
1+
*usr_02.txt* For Vim version 7.4. Last change: 2016 Jan 16
22

33
VIM USER MANUAL - by Bram Moolenaar
44

@@ -554,38 +554,42 @@ Summary: *help-summary* >
554554
8) Ex-commands always start with ":", so to go to the :s command help: >
555555
:help :s
556556
557-
9) Key combinations. They usually start with a single letter indicating
558-
the mode for which they can be used. E.g.: >
557+
9) Commands specifically for debugging start with ">". To go to to the help
558+
for the "cont" debug command: >
559+
:help >cont
560+
561+
10) Key combinations. They usually start with a single letter indicating
562+
the mode for which they can be used. E.g.: >
559563
:help i_CTRL-X
560-
< takes you to the family of Ctrl-X commands for insert mode which can be
561-
used to auto complete different things. Note, that certain keys will
562-
always be written the same, e.g. Control will always be CTRL.
563-
For normal mode commands there is no prefix and the topic is available at
564-
:h CTRL-<Letter>. E.g. >
564+
< takes you to the family of Ctrl-X commands for insert mode which can be
565+
used to auto complete different things. Note, that certain keys will
566+
always be written the same, e.g. Control will always be CTRL.
567+
For normal mode commands there is no prefix and the topic is available at
568+
:h CTRL-<Letter>. E.g. >
565569
:help CTRL-W
566-
< In contrast >
570+
< In contrast >
567571
:help c_CTRL-R
568-
< will describe what the Ctrl-R does when entering commands in the Command
569-
line and >
572+
< will describe what the Ctrl-R does when entering commands in the Command
573+
line and >
570574
:help v_Ctrl-A
571-
< talks about incrementing numbers in visual mode and >
575+
< talks about incrementing numbers in visual mode and >
572576
:help g_CTRL-A
573-
< talks about the g<C-A> command (e.g. you have to press "g" then <Ctrl-A>).
574-
Here the "g" stand for the normal command "g" which always expects a second
575-
key before doing something similar to the commands starting with "z"
577+
< talks about the g<C-A> command (e.g. you have to press "g" then <Ctrl-A>).
578+
Here the "g" stand for the normal command "g" which always expects a second
579+
key before doing something similar to the commands starting with "z"
576580

577-
10) Regexp items always start with /. So to get help for the "\+" quantifier
581+
11) Regexp items always start with /. So to get help for the "\+" quantifier
578582
in Vim regexes: >
579583
:help /\+
580-
< If you need to know everything about regular expressions, start reading
581-
at: >
584+
< If you need to know everything about regular expressions, start reading
585+
at: >
582586
:help pattern.txt
583587
584-
11) Registers always start with "quote". To find out about the special ":"
588+
12) Registers always start with "quote". To find out about the special ":"
585589
register: >
586590
:help quote:
587591
588-
12) Vim Script (VimL) is available at >
592+
13) Vim Script (VimL) is available at >
589593
:help eval.txt
590594
< Certain aspects of the language are available at :h expr-X where "X" is a
591595
single letter. E.g. >
@@ -600,7 +604,7 @@ Summary: *help-summary* >
600604
< talks about the append VimL function rather than how to append text in the
601605
current buffer.
602606

603-
13) Mappings are talked about in the help page :h |map.txt|. Use >
607+
14) Mappings are talked about in the help page :h |map.txt|. Use >
604608
:help mapmode-i
605609
< to find out about the |:imap| command. Also use :map-topic
606610
to find out about certain subtopics particular for mappings. e.g: >
@@ -609,19 +613,19 @@ Summary: *help-summary* >
609613
:help map-bar
610614
< for how the '|' is handled in mappings.
611615

612-
14) Command definitions are talked about :h command-topic, so use >
616+
15) Command definitions are talked about :h command-topic, so use >
613617
:help command-bar
614618
< to find out about the '!' argument for custom commands.
615619

616-
15) Window management commands always start with CTRL-W, so you find the
620+
16) Window management commands always start with CTRL-W, so you find the
617621
corresponding help at :h CTRL-W_letter. E.g. >
618622
:help CTRL-W_p
619-
< for moving the previous accessed window). You can also access >
623+
< for moving the previous accessed window. You can also access >
620624
:help windows.txt
621625
< and read your way through if you are looking for window handling
622626
commands.
623627

624-
16) Use |:helpgrep| to search in all help pages (and also of any installed
628+
17) Use |:helpgrep| to search in all help pages (and also of any installed
625629
plugins). See |:helpgrep| for how to use it.
626630
To search for a topic: >
627631
:helpgrep topic
@@ -632,7 +636,7 @@ Summary: *help-summary* >
632636
:copen
633637
< Move around to the match you like and press Enter to jump to that help.
634638

635-
17) The user manual. This describes help topics for beginners in a rather
639+
18) The user manual. This describes help topics for beginners in a rather
636640
friendly way. Start at |usr_toc.txt| to find the table of content (as you
637641
might have guessed): >
638642
:help usr_toc.txt
@@ -645,31 +649,31 @@ Summary: *help-summary* >
645649
:help 10.1
646650
< goes to chapter 10.1 in |usr_10.txt| and talks about recording macros.
647651

648-
18) Highlighting groups. Always start with hl-groupname. E.g. >
652+
19) Highlighting groups. Always start with hl-groupname. E.g. >
649653
:help hl-WarningMsg
650654
< talks about the WarningMsg highlighting group.
651655

652-
19) Syntax highlighting is namespaced to :syn-topic e.g. >
656+
20) Syntax highlighting is namespaced to :syn-topic e.g. >
653657
:help :syn-conceal
654658
< talks about the conceal argument for the :syn command.
655659

656-
20) Quickfix commands usually start with :c while location list commands
660+
21) Quickfix commands usually start with :c while location list commands
657661
usually start with :l
658662

659-
21) Autocommand events can be found by their name: >
663+
22) Autocommand events can be found by their name: >
660664
:help BufWinLeave
661665
< To see all possible events: >
662666
:help autocommands-events
663667
664-
22) Command-line switches always start with "-". So for the help of the -f
668+
23) Command-line switches always start with "-". So for the help of the -f
665669
command switch of Vim use: >
666670
:help -f
667671
668-
23) Optional features always start with "+". To find out about the
672+
24) Optional features always start with "+". To find out about the
669673
conceal feature use: >
670674
:help +conceal
671675
672-
24) Documentation for included filetype specific functionality is usually
676+
25) Documentation for included filetype specific functionality is usually
673677
available in the form ft-<filetype>-<functionality>. So >
674678
:help ft-c-syntax
675679
< talks about the C syntax file and the option it provides. Sometimes,
@@ -679,7 +683,7 @@ Summary: *help-summary* >
679683
:help ft-tex-plugin
680684
< are available.
681685

682-
25) Error and Warning codes can be looked up directly in the help. So >
686+
26) Error and Warning codes can be looked up directly in the help. So >
683687
:help E297
684688
< takes you exactly to the description of the swap error message and >
685689
:help W10

0 commit comments

Comments
 (0)