diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-09-25 22:11:48 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-09-25 22:11:48 +0200 |
commit | 3e496b0ea31996b665824f45664dee1fdd73c4d0 (patch) | |
tree | ba186d3f36fe10fa470832b8d5ef9ec225740378 /runtime | |
parent | 9af418427652562384744648d7d173a4bfebba95 (diff) | |
download | vim-git-3e496b0ea31996b665824f45664dee1fdd73c4d0.tar.gz |
Updated runtime files.
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/autoload/getscript.vim | 2 | ||||
-rw-r--r-- | runtime/autoload/phpcomplete.vim | 2 | ||||
-rw-r--r-- | runtime/autoload/tar.vim | 2 | ||||
-rw-r--r-- | runtime/autoload/vimball.vim | 2 | ||||
-rw-r--r-- | runtime/autoload/zip.vim | 6 | ||||
-rw-r--r-- | runtime/doc/eval.txt | 3 | ||||
-rw-r--r-- | runtime/doc/intro.txt | 14 | ||||
-rw-r--r-- | runtime/doc/pi_netrw.txt | 12 | ||||
-rw-r--r-- | runtime/doc/todo.txt | 18 | ||||
-rw-r--r-- | runtime/indent/cdl.vim | 2 | ||||
-rw-r--r-- | runtime/indent/html.vim | 2 | ||||
-rw-r--r-- | runtime/syntax/ave.vim | 2 | ||||
-rw-r--r-- | runtime/syntax/fortran.vim | 14 | ||||
-rw-r--r-- | runtime/syntax/sh.vim | 2 |
14 files changed, 42 insertions, 41 deletions
diff --git a/runtime/autoload/getscript.vim b/runtime/autoload/getscript.vim index d50bc2edc..f64c5f199 100644 --- a/runtime/autoload/getscript.vim +++ b/runtime/autoload/getscript.vim @@ -236,7 +236,7 @@ fun! getscript#GetLatestVimScripts() " call Decho("..depscript<".depscript.">") " found a "GetLatestVimScripts: # #" line in the script; - " check if its already in the datafile by searching backwards from llp1, + " check if it's already in the datafile by searching backwards from llp1, " the (prior to reading in the plugin script) last line plus one of the GetLatestVimScripts.dat file, " for the script-id with no wrapping allowed. let curline = line(".") diff --git a/runtime/autoload/phpcomplete.vim b/runtime/autoload/phpcomplete.vim index 7f25d9df3..0d01bc8bf 100644 --- a/runtime/autoload/phpcomplete.vim +++ b/runtime/autoload/phpcomplete.vim @@ -931,7 +931,7 @@ function! phpcomplete#EvaluateModifiers(modifiers, required_modifiers, prohibite endfor for modifier in a:modifiers - " if the modifier is prohibited its a no match + " if the modifier is prohibited it's a no match if index(a:prohibited_modifiers, modifier) != -1 return 0 endif diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim index 5e76870cc..9c518cb9d 100644 --- a/runtime/autoload/tar.vim +++ b/runtime/autoload/tar.vim @@ -117,7 +117,7 @@ fun! tar#Browse(tarfile) if !filereadable(a:tarfile) " call Decho('a:tarfile<'.a:tarfile.'> not filereadable') if a:tarfile !~# '^\a\+://' - " if its an url, don't complain, let url-handlers such as vim do its thing + " if it's an url, don't complain, let url-handlers such as vim do its thing redraw! echohl Error | echo "***error*** (tar#Browse) File not readable<".a:tarfile.">" | echohl None endif diff --git a/runtime/autoload/vimball.vim b/runtime/autoload/vimball.vim index 1af6b19c8..9c7dcbda0 100644 --- a/runtime/autoload/vimball.vim +++ b/runtime/autoload/vimball.vim @@ -347,7 +347,7 @@ fun! vimball#Vimball(really,...) " call Decho("exe tabn ".curtabnr) exe "tabn ".curtabnr - " set up help if its a doc/*.txt file + " set up help if it's a doc/*.txt file " call Decho("didhelp<".didhelp."> fname<".fname.">") if a:really && didhelp == "" && fname =~ 'doc/[^/]\+\.\(txt\|..x\)$' let didhelp= substitute(fname,'^\(.*\<doc\)[/\\][^.]*\.\(txt\|..x\)$','\1','') diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index 824af01fe..ea086e088 100644 --- a/runtime/autoload/zip.vim +++ b/runtime/autoload/zip.vim @@ -65,14 +65,14 @@ endif " zip#Browse: {{{2 fun! zip#Browse(zipfile) " call Dfunc("zip#Browse(zipfile<".a:zipfile.">)") - " sanity check: insure that the zipfile has "PK" as its first two letters + " sanity check: ensure that the zipfile has "PK" as its first two letters " (zipped files have a leading PK as a "magic cookie") if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK' exe "noautocmd e ".fnameescape(a:zipfile) " call Dret("zip#Browse : not a zipfile<".a:zipfile.">") return " else " Decho -" call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - its a zip file") +" call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - it's a zip file") endif let repkeep= &report @@ -95,7 +95,7 @@ fun! zip#Browse(zipfile) endif if !filereadable(a:zipfile) if a:zipfile !~# '^\a\+://' - " if its an url, don't complain, let url-handlers such as vim do its thing + " if it's an url, don't complain, let url-handlers such as vim do its thing redraw! echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None " call inputsave()|call input("Press <cr> to continue")|call inputrestore() diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 658bc5538..d34fa5be2 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 8.0. Last change: 2016 Sep 22 +*eval.txt* For Vim version 8.0. Last change: 2016 Sep 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4788,6 +4788,7 @@ histadd({history}, {item}) *histadd()* "expr" or "=" typed expression history "input" or "@" input line history "debug" or ">" debug command history + empty the current or last used history The {history} string does not need to be the whole name, one character is sufficient. If {item} does already exist in the history, it will be diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 21ef5e3d4..58459057d 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 8.0. Last change: 2015 Jan 20 +*intro.txt* For Vim version 8.0. Last change: 2016 Sep 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -135,10 +135,14 @@ http://www.vim.org/maillist.php Bug reports: *bugs* *bug-reports* *bugreport.vim* -Send bug reports to: Vim Developers <vim-dev@vim.org> -This is a maillist, you need to become a member first and many people will see -the message. If you don't want that, e.g. because it is a security issue, -send it to <bugs@vim.org>, this only goes to the Vim maintainer (that's Bram). +There are two ways to report bugs, both work: +1. Send bug reports to: Vim Developers <vim-dev@vim.org> + This is a maillist, you need to become a member first and many people will + see the message. If you don't want that, e.g. because it is a security + issue, send it to <bugs@vim.org>, this only goes to the Vim maintainer + (that's Bram). +2. Open issue on GitHub: https://github.com/vim/vim/issues + The text will be forwarded to the vim-dev maillist. Please be brief; all the time that is spent on answering mail is subtracted from the time that is spent on improving Vim! Always give a reproducible diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 5c8009573..914c5767c 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -532,7 +532,7 @@ variable (ex. scp uses the variable g:netrw_scp_cmd, which is defaulted to let g:netrw_sftp_cmd= '"c:\Program Files\PuTTY\psftp.exe"' < (note: it has been reported that windows 7 with putty v0.6's "-batch" option - doesn't work, so its best to leave it off for that system) + doesn't work, so it's best to leave it off for that system) See |netrw-p8| for more about putty, pscp, psftp, etc. @@ -1206,7 +1206,7 @@ The :NetrwMB command is available outside of netrw buffers (once netrw has been invoked in the session). The file ".netrwbook" holds bookmarks when netrw (and vim) is not active. By -default, its stored on the first directory on the user's |'runtimepath'|. +default, it's stored on the first directory on the user's |'runtimepath'|. Related Topics: |netrw-gb| how to return (go) to a bookmark @@ -1431,7 +1431,7 @@ be used in that count. *.netrwhist* See |g:netrw_dirhistmax| for how to control the quantity of history stack slots. The file ".netrwhist" holds history when netrw (and vim) is not -active. By default, its stored on the first directory on the user's +active. By default, it's stored on the first directory on the user's |'runtimepath'|. Related Topics: @@ -3271,7 +3271,7 @@ The user function is passed one argument; it resembles > fun! ExampleUserMapFunc(islocal) < -where a:islocal is 1 if its a local-directory system call or 0 when +where a:islocal is 1 if it's a local-directory system call or 0 when remote-directory system call. Use netrw#Expose("varname") to access netrw-internal (script-local) @@ -3595,7 +3595,7 @@ Example: Clear netrw's marked file list via a mapping on gu > *netrw-p16* P16. When editing remote files (ex. :e ftp://hostname/path/file), - under Windows I get an |E303| message complaining that its unable + under Windows I get an |E303| message complaining that it's unable to open a swap file. (romainl) It looks like you are starting Vim from a protected @@ -3649,7 +3649,7 @@ Example: Clear netrw's marked file list via a mapping on gu > P21. I've made a directory (or file) with an accented character, but netrw isn't letting me enter that directory/read that file: - Its likely that the shell or o/s is using a different encoding + It's likely that the shell or o/s is using a different encoding than you have vim (netrw) using. A patch to vim supporting "systemencoding" may address this issue in the future; for now, just have netrw use the proper encoding. For example: > diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 8b3c47705..2544c8d90 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 8.0. Last change: 2016 Sep 22 +*todo.txt* For Vim version 8.0. Last change: 2016 Sep 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,16 +34,7 @@ not be repeated below, unless there is extra information. *known-bugs* -------------------- Known bugs and current work ----------------------- -Ukrainian translations (Anatolii Sakhnik, 2016 Sep 15) - -Netbeans test fails with Python 3. (jonathon, 2016 Sep 13, #1070) - -Revert 7.4.990? (Christian Brabandt, 2016 Sep 16) - -Update for ratpoison (Magnus Woldrich, 2016 Sep 15) - -Crash when editing file with only encryption header. (igor2x, 2016 Sep 18, -#1096) Patch by Christian, Sep 22. +Move test71 tests to test_crypt. Idea from Sven: record sequence of keys. Useful to show others what they are doing (look over the shoulder), and also to see what happened. @@ -52,6 +43,7 @@ Could store in logfile to be able to analyise it with an external command. E.g. to see when's the last time a plugin command was used. Patch for typos. (Matthew Brener, 2016 Sep 16, #1088) +Lots of its to it's. After 8.0 is released: - Drop support for older MS-Windows systems, before XP. @@ -62,6 +54,7 @@ After 8.0 is released: Perhaps try to read once more? Possibly reproduced by Santiago Alejandro Agüero, 2016 Sep 12, 13. Apparently select() returns an error while reading could work. + Another example from Daniel Hahler, Sep 24. - Problem with stderr on Windows? (Vincent Rischmann, 2016 Aug 31, #1026) - Add 'cwd' argument to start_job(): directory to change to in the child. check for valid directory before forking. @@ -157,6 +150,9 @@ Add tests for using number larger than number of lines in buffer. Invalid behavior with NULL list. (Nikolai Pavlov, #768) E.g. deepcopy(test_null_list()) +Patch to make it possible to extend a list with itself. +(Nikolai Pavlov, 2016 Sep 23) + min() and max() spawn lots of error messages if sorted list/dictionary contains invalid data (Nikolay Pavlov, 2016 Sep 4, #1039) diff --git a/runtime/indent/cdl.vim b/runtime/indent/cdl.vim index db2b9052b..5ec2a7b21 100644 --- a/runtime/indent/cdl.vim +++ b/runtime/indent/cdl.vim @@ -16,7 +16,7 @@ if exists("*CdlGetIndent") "finish endif -" find out if an "...=..." expresion its an asignment (or a conditional) +" find out if an "...=..." expresion is an assignment (or a conditional) " it scans 'line' first, and then the previos lines fun! CdlAsignment(lnum, line) let f = -1 diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim index 828bc3120..13adaae54 100644 --- a/runtime/indent/html.vim +++ b/runtime/indent/html.vim @@ -749,7 +749,7 @@ func! s:CssPrevNonComment(lnum, stopline) while 1 let ccol = match(getline(lnum), '\*/') if ccol < 0 - " No comment end thus its something else. + " No comment end thus it's something else. return lnum endif call cursor(lnum, ccol + 1) diff --git a/runtime/syntax/ave.vim b/runtime/syntax/ave.vim index 3e82a8bc9..e63e7d2c3 100644 --- a/runtime/syntax/ave.vim +++ b/runtime/syntax/ave.vim @@ -34,7 +34,7 @@ syn match aveNumber "[+-]\=\<[0-9]\+\>" " Operator syn keyword aveOperator or and max min xor mod by -" 'not' is a kind of a problem: Its an Operator as well as a method +" 'not' is a kind of a problem: It's an Operator as well as a method " 'not' is only marked as an Operator if not applied as method syn match aveOperator "[^\.]not[^a-zA-Z]" diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim index 0b56f5b3a..9d9ab69a3 100644 --- a/runtime/syntax/fortran.vim +++ b/runtime/syntax/fortran.vim @@ -1,17 +1,17 @@ " Vim syntax file " Language: Fortran 2008 (and older: Fortran 2003, 95, 90, and 77) -" Version: 0.98 -" Last Change: 2016 Aug. 29 +" Version: 0.99 +" Last Change: 2016 Sep. 23 " Maintainer: Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/> " Usage: For instructions, do :help fortran-syntax from Vim " Credits: -" Version 0.1 (April 2000) was based on the fortran 77 syntax file by Mario Eusebio and -" Preben Guldberg. Since then, useful suggestions and contributions have been made, -" in chronological order, by: +" Version 0.1 (April 2000) for Fortran 95 was based on the Fortran 77 syntax file by +" Mario Eusebio and Preben Guldberg. Since then, useful suggestions and contributions +" have been made, in chronological order, by: " Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile, " Walter Dieudonné, Alexander Wagner, Roman Bertle, Charles Rendleman, " Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann, -" Stefano Zaghi and Vishnu V. Krishnan. +" Stefano Zaghi, Vishnu V. Krishnan and Judicaël Grasset if exists("b:current_syntax") finish @@ -368,7 +368,7 @@ else endif syn match fortranComment excludenl "!.*$" contains=@fortranCommentGroup,@spell -syn match fortranOpenMP excludenl "^\s*!\$\(OMP\)\=\s.*$" +syn match fortranOpenMP excludenl "^\s*!\$\(OMP\)\=&\=\s.*$" "cpp is often used with Fortran syn match cPreProc "^\s*#\s*\(define\|ifdef\)\>.*" diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim index 18da77976..6048aed4e 100644 --- a/runtime/syntax/sh.vim +++ b/runtime/syntax/sh.vim @@ -381,7 +381,7 @@ ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<-\s*\\\z([^ \ " Here Strings: {{{1 " ============= -" available for: bash; ksh (really should be ksh93 only) but not if its a posix +" available for: bash; ksh (really should be ksh93 only) but not if it's a posix if exists("b:is_bash") || (exists("b:is_kornshell") && !exists("g:is_posix")) syn match shHereString "<<<" skipwhite nextgroup=shCmdParenRegion endif |