Skip to content

Commit d079690

Browse files
committed
Updated runtime files.
1 parent 3c4ebeb commit d079690

13 files changed

Lines changed: 191 additions & 72 deletions

File tree

READMEdir/README_mac.txt

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,25 @@ This file explains the installation of Vim on Macintosh systems.
44
See "README.txt" for general information about Vim.
55

66

7-
Sorry, this text still needs to be written!
7+
To build from sources, like on Unix
88

9+
1. Get the build tools: "clang" and "make". These can be installed with the
10+
"CommandLineTools" package. If you don't have one, do
11+
xcode-select --install
12+
Just like for any software development with OS X.
13+
14+
2. Get the source code. Best is to use git (which you need to install first),
15+
see http://www.vim.org/git.php
16+
Or you can download and unpack the Unix tar archive, see
17+
http://www.vim.org/download.php
18+
19+
3. Go to the top directory of the source tree, do
20+
make
21+
sudo make install
22+
A newly built vim will be installed under "/usr/local".
23+
24+
25+
If you can't manage to make this work, there is a fallback using Homebrew:
26+
27+
1. Install Homebrew from http://brew.sh/
28+
2. Install latest Vim with: brew install vim

runtime/autoload/zip.vim

Lines changed: 63 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
" zip.vim: Handles browsing zipfiles
22
" AUTOLOAD PORTION
3-
" Date: Jul 02, 2013
4-
" Version: 27
3+
" Date: Sep 13, 2016
4+
" Version: 28
55
" Maintainer: Charles E Campbell <[email protected]>
66
" License: Vim License (see vim's :help license)
77
" Copyright: Copyright (C) 2005-2013 Charles E. Campbell {{{1
@@ -20,10 +20,10 @@
2020
if &cp || exists("g:loaded_zip")
2121
finish
2222
endif
23-
let g:loaded_zip= "v27"
23+
let g:loaded_zip= "v28"
2424
if v:version < 702
2525
echohl WarningMsg
26-
echo "***warning*** this version of zip needs vim 7.2"
26+
echo "***warning*** this version of zip needs vim 7.2 or later"
2727
echohl Normal
2828
finish
2929
endif
@@ -53,6 +53,9 @@ endif
5353
if !exists("g:zip_unzipcmd")
5454
let g:zip_unzipcmd= "unzip"
5555
endif
56+
if !exists("g:zip_extractcmd")
57+
let g:zip_extractcmd= g:zip_unzipcmd
58+
endif
5659

5760
" ----------------
5861
" Functions: {{{1
@@ -136,8 +139,10 @@ fun! zip#Browse(zipfile)
136139
return
137140
endif
138141

142+
" Maps associated with zip plugin
139143
setlocal noma nomod ro
140-
noremap <silent> <buffer> <cr> :call <SID>ZipBrowseSelect()<cr>
144+
noremap <silent> <buffer> <cr> :call <SID>ZipBrowseSelect()<cr>
145+
noremap <silent> <buffer> x :call zip#Extract()<cr>
141146
142147
let &report= repkeep
143148
" call Dret("zip#Browse")
@@ -204,6 +209,15 @@ fun! zip#Read(fname,mode)
204209
endif
205210
" call Decho("zipfile<".zipfile.">")
206211
" call Decho("fname <".fname.">")
212+
" sanity check
213+
if !executable(substitute(g:zip_unzipcmd,'\s\+.*$','',''))
214+
redraw!
215+
echohl Error | echo "***error*** (zip#Read) sorry, your system doesn't appear to have the ".g:zip_unzipcmd." program" | echohl None
216+
" call inputsave()|call input("Press <cr> to continue")|call inputrestore()
217+
let &report= repkeep
218+
" call Dret("zip#Write")
219+
return
220+
endif
207221

208222
" the following code does much the same thing as
209223
" exe "keepj sil! r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1)
@@ -236,9 +250,9 @@ fun! zip#Write(fname)
236250
set report=10
237251

238252
" sanity checks
239-
if !executable(g:zip_zipcmd)
253+
if !executable(substitute(g:zip_zipcmd,'\s\+.*$','',''))
240254
redraw!
241-
echohl Error | echo "***error*** (zip#Write) sorry, your system doesn't appear to have the zip pgm" | echohl None
255+
echohl Error | echo "***error*** (zip#Write) sorry, your system doesn't appear to have the ".g:zip_zipcmd." program" | echohl None
242256
" call inputsave()|call input("Press <cr> to continue")|call inputrestore()
243257
let &report= repkeep
244258
" call Dret("zip#Write")
@@ -344,6 +358,48 @@ fun! zip#Write(fname)
344358
" call Dret("zip#Write")
345359
endfun
346360

361+
" ---------------------------------------------------------------------
362+
" zip#Extract: extract a file from a zip archive {{{2
363+
fun! zip#Extract()
364+
" call Dfunc("zip#Extract()")
365+
366+
let repkeep= &report
367+
set report=10
368+
let fname= getline(".")
369+
" call Decho("fname<".fname.">")
370+
371+
" sanity check
372+
if fname =~ '^"'
373+
let &report= repkeep
374+
" call Dret("zip#Extract")
375+
return
376+
endif
377+
if fname =~ '/$'
378+
redraw!
379+
echohl Error | echo "***error*** (zip#Extract) Please specify a file, not a directory" | echohl None
380+
let &report= repkeep
381+
" call Dret("zip#Extract")
382+
return
383+
endif
384+
385+
" extract the file mentioned under the cursor
386+
" call Decho("system(".g:zip_extractcmd." ".shellescape(b:zipfile)." ".shellescape(shell).")")
387+
call system(g:zip_extractcmd." ".shellescape(b:zipfile)." ".shellescape(shell))
388+
" call Decho("zipfile<".b:zipfile.">")
389+
if v:shell_error != 0
390+
echohl Error | echo "***error*** ".g:zip_extractcmd." ".b:zipfile." ".fname.": failed!" | echohl NONE
391+
elseif !filereadable(fname)
392+
echohl Error | echo "***error*** attempted to extract ".fname." but it doesn't appear to be present!"
393+
else
394+
echo "***note*** successfully extracted ".fname
395+
endif
396+
397+
" restore option
398+
let &report= repkeep
399+
400+
" call Dret("zip#Extract")
401+
endfun
402+
347403
" ---------------------------------------------------------------------
348404
" s:Escape: {{{2
349405
fun! s:Escape(fname,isfilt)

runtime/doc/gui_x11.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*gui_x11.txt* For Vim version 8.0. Last change: 2016 Aug 21
1+
*gui_x11.txt* For Vim version 8.0. Last change: 2016 Sep 12
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -475,7 +475,7 @@ your system has a working pkg-config together with the .pc file of the
475475
required GTK+. For that, say, run the following on the command line to see if
476476
your pkg-config works with your GTK+ 2: >
477477
478-
$ pkgconfig --modversion gtk+-2.0
478+
$ pkg-config --modversion gtk+-2.0
479479
480480
Replace gtk+-2.0 with gtk+-3.0 for GTK+ 3. If you get the correct version
481481
number of your GTK+, you can proceed; if not, you probably need to do some

runtime/doc/help.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*help.txt* For Vim version 8.0. Last change: 2016 Mar 31
1+
*help.txt* For Vim version 8.0. Last change: 2016 Sep 12
22

33
VIM - main help file
44
k
@@ -135,6 +135,7 @@ Advanced editing ~
135135
|autocmd.txt| automatically executing commands on an event
136136
|filetype.txt| settings done specifically for a type of file
137137
|eval.txt| expression evaluation, conditional commands
138+
|channel.txt| Jobs, Channels, inter-process communication
138139
|fold.txt| hide (fold) ranges of lines
139140

140141
Special issues ~

runtime/doc/options.txt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*options.txt* For Vim version 8.0. Last change: 2016 Sep 02
1+
*options.txt* For Vim version 8.0. Last change: 2016 Sep 13
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -2633,7 +2633,7 @@ A jump table for the options with a short description can be found at |Q_op|.
26332633
uhex Show unprintable characters hexadecimal as <xx>
26342634
instead of using ^C and ~C.
26352635

2636-
When neither "lastline" or "truncate" is included, a last line that
2636+
When neither "lastline" nor "truncate" is included, a last line that
26372637
doesn't fit is replaced with "@" lines.
26382638

26392639
*'eadirection'* *'ead'*
@@ -6122,7 +6122,9 @@ A jump table for the options with a short description can be found at |Q_op|.
61226122
personal preferences to overrule or add to the distributed defaults
61236123
or system-wide settings (rarely needed).
61246124

6125-
More entries are added when using |packages|.
6125+
More entries are added when using |packages|. If it gets very long
6126+
then `:set rtp` will be truncated, use `:echo &rtp` to see the full
6127+
string.
61266128

61276129
Note that, unlike 'path', no wildcards like "**" are allowed. Normal
61286130
wildcards are allowed, but can significantly slow down searching for

runtime/doc/pi_zip.txt

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
*pi_zip.txt* For Vim version 8.0. Last change: 2013 Apr 17
1+
*pi_zip.txt* For Vim version 8.0. Last change: 2016 Sep 13
22

33
+====================+
44
| Zip File Interface |
55
+====================+
66

77
Author: Charles E. Campbell <[email protected]>
88
(remove NOSPAM from Campbell's email first)
9-
Copyright: Copyright (C) 2005-2012 Charles E Campbell *zip-copyright*
9+
Copyright: Copyright (C) 2005-2015 Charles E Campbell *zip-copyright*
1010
The VIM LICENSE (see |copyright|) applies to the files in this
1111
package, including zipPlugin.vim, zip.vim, and pi_zip.vim. except use
1212
"zip.vim" instead of "VIM". Like anything else that's free, zip.vim
@@ -33,6 +33,9 @@ Copyright: Copyright (C) 2005-2012 Charles E Campbell *zip-copyright*
3333
also write to the file. Currently, one may not make a new file in
3434
zip archives via the plugin.
3535

36+
*zip-x*
37+
x : may extract a listed file when the cursor is atop it
38+
3639
OPTIONS
3740

3841
*g:zip_nomax*
@@ -60,6 +63,11 @@ Copyright: Copyright (C) 2005-2012 Charles E Campbell *zip-copyright*
6063
It's used during the writing (updating) of a file already in a zip
6164
file; by default: >
6265
let g:zip_zipcmd= "zip"
66+
<
67+
*g:zip_extractcmd*
68+
This option specifies the program (and any options needed) used to
69+
extract a file from a zip archive. By default, >
70+
let g:zip_extractcmd= g:zip_unzipcmd
6371
<
6472
PREVENTING LOADING~
6573

@@ -83,8 +91,26 @@ Copyright: Copyright (C) 2005-2012 Charles E Campbell *zip-copyright*
8391
One can simply extend this line to accommodate additional extensions that
8492
should be treated as zip files.
8593

94+
Alternatively, one may change *g:zipPlugin_ext* in one's .vimrc.
95+
Currently (11/30/15) it holds: >
96+
97+
let g:zipPlugin_ext= '*.zip,*.jar,*.xpi,*.ja,*.war,*.ear,*.celzip,
98+
\ *.oxt,*.kmz,*.wsz,*.xap,*.docx,*.docm,*.dotx,*.dotm,*.potx,*.potm,
99+
\ *.ppsx,*.ppsm,*.pptx,*.pptm,*.ppam,*.sldx,*.thmx,*.xlam,*.xlsx,*.xlsm,
100+
\ *.xlsb,*.xltx,*.xltm,*.xlam,*.crtx,*.vdw,*.glox,*.gcsx,*.gqsx,*.epub'
101+
86102
==============================================================================
87103
4. History *zip-history* {{{1
104+
v28 Oct 08, 2014 * changed the sanity checks for executables to reflect
105+
the command actually to be attempted in zip#Read()
106+
and zip#Write()
107+
* added the extraction of a file capability
108+
Nov 30, 2015 * added *.epub to the |g:zipPlugin_ext| list
109+
Sep 13, 2016 * added *.apk to the |g:zipPlugin_ext| list and
110+
sorted the suffices.
111+
v27 Jul 02, 2013 * sanity check: zipfile must have "PK" as its first
112+
two bytes.
113+
* modified to allow zipfile: entries in quickfix lists
88114
v26 Nov 15, 2012 * (Jason Spiro) provided a lot of new extensions that
89115
are synonyms for .zip
90116
v25 Jun 27, 2011 * using keepj with unzip -Z

runtime/doc/syntax.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*syntax.txt* For Vim version 8.0. Last change: 2016 Sep 12
1+
*syntax.txt* For Vim version 8.0. Last change: 2016 Sep 13
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -3521,8 +3521,8 @@ SYNTAX ISKEYWORD SETTING *:syn-iskeyword*
35213521
and also determines where |:syn-keyword| will be checked for a new
35223522
match.
35233523

3524-
It is recommended when writing syntax files, to use this command
3525-
to the correct value for the specific syntax language and not change
3524+
It is recommended when writing syntax files, to use this command to
3525+
set the correct value for the specific syntax language and not change
35263526
the 'iskeyword' option.
35273527

35283528
DEFINING KEYWORDS *:syn-keyword*

runtime/doc/todo.txt

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
*todo.txt* For Vim version 8.0. Last change: 2016 Sep 12
1+
*todo.txt* For Vim version 8.0. Last change: 2016 Sep 16
22

33

44
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -34,13 +34,19 @@ not be repeated below, unless there is extra information.
3434
*known-bugs*
3535
-------------------- Known bugs and current work -----------------------
3636

37+
Netbeans test fails with Python 3. (jonathon, 2016 Sep 13, #1070)
38+
39+
Revert 7.4.990? (Christian Brabandt, 2016 Sep 16)
40+
3741
After 8.0 is released:
3842
- Drop support for older MS-Windows systems, before XP.
39-
Patch from Ken Takata, 2016 Mar 8.
43+
Patch from Ken Takata, updated 2016 Sep 12.
4044

4145
+channel:
4246
- channel_wait() may return an error while there is still something to read.
4347
Perhaps try to read once more?
48+
Possibly reproduced by Santiago Alejandro Agüero, 2016 Sep 12, 13.
49+
Apparently select() returns an error while reading could work.
4450
- Problem with stderr on Windows? (Vincent Rischmann, 2016 Aug 31, #1026)
4551
- Add 'cwd' argument to start_job(): directory to change to in the child.
4652
check for valid directory before forking.
@@ -142,6 +148,9 @@ sort() is not stable when using numeric/float sort (Nikolay Pavlov, 2016 Sep
142148

143149
cmap using execute() has side effects. (Killthemule, 2016 Aug 17, #983)
144150

151+
When using ":diffput" through a mapping, undo in the target buffer isn't
152+
synced. (Ryan Carney, 2016 Sep 14)
153+
145154
Syntax highlighting for messages with RFC3339 timestamp (#946)
146155
Did maintainer reply?
147156

@@ -183,6 +192,11 @@ Patch for syntax folding optimization. (Shougo, 2016 Sep 6, #1045)
183192
Patch for restoring wide characters in the console buffer.
184193
(Ken Takata, 2016 Jun 7)
185194

195+
Patch for drag&drop reordering of GUI tab pages reordering.
196+
(Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe)
197+
Now on Git: https://gist.github.com/nocd5/165286495c782b815b94
198+
Update 2016 Aug 10.
199+
186200
We can use '. to go to the last change in the current buffer, but how about
187201
the last change in any buffer? Can we use ', (, is next to .)?
188202

@@ -225,7 +239,7 @@ Neovim patch for utfc_ptr2char_len() https://github.com/neovim/neovim/pull/4574
225239
No test, needs some work to include.
226240

227241
Patch to make finding duplicate tags much faster, using a hashtab. (James
228-
McCoy, 2016 Sept 6, #1046)
242+
McCoy, 2016 Sept 14, #1046) Should work now.
229243
>
230244
Patch to improve indenting for C++ constructor with initializer list.
231245
(Hirohito Higashi, 2016 Mar 31)
@@ -261,6 +275,9 @@ Can already do it with ":$put =execute('command')".
261275
When repeating the 'confirm' dialog one needs to press Enter. (ds26gte, 2016
262276
Apr 17) #762
263277

278+
exists(":tearoff") does not tell you if the command is implemented. (Tony
279+
Mechelynck) Perhaps use exists("::tearoff") to check?
280+
264281
Use vim.vim syntax highlighting for help file examples, but without ":" in
265282
'iskeyword' for syntax.
266283

@@ -520,11 +537,6 @@ OK to not block marks?
520537

521538
Mixup of highlighting when there is a match and SpellBad. (ZyX, 2015 Jan 1)
522539

523-
Patch for drag&drop reordering of GUI tab pages reordering.
524-
(Ken Takata, 2013 Nov 22, second one, also by Masamichi Abe)
525-
Now on Git: https://gist.github.com/nocd5/165286495c782b815b94
526-
Update 2016 Aug 10.
527-
528540
Patch on Issue 72: 'autochdir' causes problems for :vimgrep.
529541

530542
When 'balloonexpr' returns a list the result has a trailing newline.

0 commit comments

Comments
 (0)