Skip to content

Commit

Permalink
vim-patch:42ebd06
Browse files Browse the repository at this point in the history
Update runtime files.

vim/vim@42ebd06
  • Loading branch information
jamessan committed Feb 28, 2017
1 parent e070502 commit 1371e19
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 9 deletions.
2 changes: 1 addition & 1 deletion runtime/doc/eval.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1197,7 +1197,7 @@ lambda expression *expr-lambda* *lambda*
{args -> expr1} lambda expression

A lambda expression creates a new unnamed function which returns the result of
evaluating |expr1|. Lambda expressions are differ from |user-functions| in
evaluating |expr1|. Lambda expressions differ from |user-functions| in
the following ways:

1. The body of the lambda expression is an |expr1| and not a sequence of |Ex|
Expand Down
4 changes: 3 additions & 1 deletion runtime/doc/index.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*index.txt* For Vim version 7.4. Last change: 2016 Jun 12
*index.txt* For Vim version 7.4. Last change: 2016 Jul 16


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -1152,6 +1152,7 @@ tag command action ~
|:chdir| :chd[ir] change directory
|:checkpath| :che[ckpath] list included files
|:checktime| :checkt[ime] check timestamp of loaded buffers
|:chistory| :chi[story] list the error lists
|:clast| :cla[st] go to the specified error, default last one
|:clearjumps| :cle[arjumps] clear the jump list
|:clist| :cl[ist] list all errors
Expand Down Expand Up @@ -1313,6 +1314,7 @@ tag command action ~
|:lgrep| :lgr[ep] run 'grepprg' and jump to first match
|:lgrepadd| :lgrepa[dd] like :grep, but append to current list
|:lhelpgrep| :lh[elpgrep] like ":helpgrep" but uses location list
|:lhistory| :lhi[story] list the location lists
|:ll| :ll go to specific location
|:llast| :lla[st] go to the specified location, default last one
|:llist| :lli[st] list all locations
Expand Down
4 changes: 2 additions & 2 deletions runtime/doc/message.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*message.txt* For Vim version 7.4. Last change: 2016 Jul 14
*message.txt* For Vim version 7.4. Last change: 2016 Jul 16


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -668,7 +668,7 @@ Vim and restart it.
*E931* >
Buffer cannot be registered
Out of memory or a duplicate buffer number. May habben after W14. Looking up
Out of memory or a duplicate buffer number. May happen after W14. Looking up
a buffer will not always work, better restart Vim.

*E296* *E297* >
Expand Down
17 changes: 14 additions & 3 deletions runtime/doc/quickfix.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
*quickfix.txt* For Vim version 7.4. Last change: 2016 Jul 07
*quickfix.txt* For Vim version 7.4. Last change: 2016 Jul 17


VIM REFERENCE MANUAL by Bram Moolenaar
Expand Down Expand Up @@ -525,7 +525,7 @@ lists. They set one of the existing error lists as the current one.
list, an error message is given.

*:lolder* *:lol*
:lol[der] [count] Same as ":colder", except use the location list for
:lol[der] [count] Same as `:colder`, except use the location list for
the current window instead of the quickfix list.

*:cnewer* *:cnew* *E381*
Expand All @@ -534,9 +534,20 @@ lists. They set one of the existing error lists as the current one.
list, an error message is given.

*:lnewer* *:lnew*
:lnew[er] [count] Same as ":cnewer", except use the location list for
:lnew[er] [count] Same as `:cnewer`, except use the location list for
the current window instead of the quickfix list.

*:chistory* *:chi*
:chi[story] Show the list of error lists. The current list is
marked with ">". The output looks like:
error list 1 of 3; 43 errors ~
> error list 2 of 3; 0 errors ~
error list 3 of 3; 15 errors ~

*:lhistory* *:lhi*
:lhi[story] Show the list of location lists, otherwise like
`:chistory`.

When adding a new error list, it becomes the current list.

When ":colder" has been used and ":make" or ":grep" is used to add a new error
Expand Down
2 changes: 2 additions & 0 deletions runtime/filetype.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2642,6 +2642,8 @@ au BufNewFile,BufRead [rR]akefile* call s:StarSetf('ruby')
" Mail (also matches muttrc.vim, so this is below the other checks)
au BufNewFile,BufRead mutt[[:alnum:]._-]\\\{6\} setf mail

au BufNewFile,BufRead reportbug-* call s:StarSetf('mail')

" Modconf
au BufNewFile,BufRead */etc/modutils/*
\ if executable(expand("<afile>")) != 1
Expand Down
4 changes: 2 additions & 2 deletions runtime/menu.vim
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ an 20.435 &Edit.Startup\ &Settings :call <SID>EditVimrc()<CR>
fun! s:EditVimrc()
if $MYVIMRC != ''
let fname = $MYVIMRC
elseif has("win32") || has("dos32") || has("dos16")
elseif has("win32")
if $HOME != ''
let fname = $HOME . "/_vimrc"
else
Expand Down Expand Up @@ -552,7 +552,7 @@ endfun
func! s:XxdFind()
if !exists("g:xxdprogram")
" On the PC xxd may not be in the path but in the install directory
if (has("win32") || has("dos32")) && !executable("xxd")
if has("win32") && !executable("xxd")
let g:xxdprogram = $VIMRUNTIME . (&shellslash ? '/' : '\') . "xxd.exe"
else
let g:xxdprogram = "xxd"
Expand Down

0 comments on commit 1371e19

Please sign in to comment.