diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/eval.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/help.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/index.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/message.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/os_390.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/repeat.txt | 8 | ||||
| -rw-r--r-- | runtime/doc/starting.txt | 7 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 4 | ||||
| -rw-r--r-- | runtime/doc/tags | 38 | ||||
| -rw-r--r-- | runtime/doc/todo.txt | 18 | ||||
| -rw-r--r-- | runtime/doc/usr_29.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/various.txt | 3 | ||||
| -rw-r--r-- | runtime/doc/version5.txt | 4 | ||||
| -rw-r--r-- | runtime/syntax/fortran.vim | 15 |
14 files changed, 44 insertions, 75 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index b05e59298..4b672bbb5 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -2700,7 +2700,7 @@ ch_close({channel}) *ch_close()* ch_evalexpr({channel}, {expr} [, {options}]) *ch_evalexpr()* Send {expr} over {channel}. The {expr} is encoded according to the type of channel. The function cannot be used - with a raw channel. See |channel-use|. *E912* + with a raw channel. See |channel-use|. *E917* {options} must be a Dictionary. It must not have a "callback" entry. @@ -2804,7 +2804,7 @@ ch_readraw({channel} [, {options}]) *ch_readraw()* ch_sendexpr({channel}, {expr} [, {options}]) *ch_sendexpr()* Send {expr} over {channel}. The {expr} is encoded according to the type of channel. The function cannot be used - with a raw channel. See |channel-use|. *E912* + with a raw channel. See |channel-use|. *E912* {options} must be a Dictionary. The "callback" item is a Funcref or the name of a function it is invoked when the diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt index 968636379..09cb32533 100644 --- a/runtime/doc/help.txt +++ b/runtime/doc/help.txt @@ -1,4 +1,4 @@ -*help.txt* For Vim version 7.4. Last change: 2016 Feb 22 +*help.txt* For Vim version 7.4. Last change: 2016 Feb 27 VIM - main help file k @@ -164,7 +164,6 @@ Interfaces ~ |if_mzsch.txt| MzScheme interface |if_perl.txt| Perl interface |if_pyth.txt| Python interface -|if_sniff.txt| SNiFF+ interface |if_tcl.txt| Tcl interface |if_ole.txt| OLE automation interface for Win32 |if_ruby.txt| Ruby interface diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index fe4184aea..581ee36cc 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.4. Last change: 2016 Feb 24 +*index.txt* For Vim version 7.4. Last change: 2016 Feb 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1499,7 +1499,6 @@ tag command action ~ |:smile| :smi[le] make the user happy |:snext| :sn[ext] split window and go to next file in the argument list -|:sniff| :sni[ff] send request to sniff |:snomagic| :sno[magic] :substitute with 'nomagic' |:snoremap| :snor[emap] like ":noremap" but for Select mode |:snoremenu| :snoreme[nu] like ":noremenu" but for Select mode diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 84afe2f2b..56745f396 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 7.4. Last change: 2013 Feb 23 +*message.txt* For Vim version 7.4. Last change: 2016 Feb 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -476,8 +476,6 @@ in memory, you can reduce that with these options: helps for a change that affects all lines. - 'undoreload' Set to zero to disable. -Also see |msdos-limitations|. - *E339* > Pattern too long diff --git a/runtime/doc/os_390.txt b/runtime/doc/os_390.txt index 5e564d841..3bd1df9ce 100644 --- a/runtime/doc/os_390.txt +++ b/runtime/doc/os_390.txt @@ -1,4 +1,4 @@ -*os_390.txt* For Vim version 7.4. Last change: 2010 May 30 +*os_390.txt* For Vim version 7.4. Last change: 2016 Feb 27 VIM REFERENCE MANUAL by Ralf Schandl @@ -108,7 +108,6 @@ Never tested: - Langmap (|'langmap'|) - Python support (|Python|) - Right-to-left mode (|'rightleft'|) - - SNiFF+ interface (|sniff|) - TCL interface (|tcl|) ... diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt index db1ec9bad..711b13890 100644 --- a/runtime/doc/repeat.txt +++ b/runtime/doc/repeat.txt @@ -1,4 +1,4 @@ -*repeat.txt* For Vim version 7.4. Last change: 2016 Feb 24 +*repeat.txt* For Vim version 7.4. Last change: 2016 Feb 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -221,6 +221,10 @@ For writing a Vim script, see chapter 41 of the user manual |usr_41.txt|. 'runtimepath'. And the directory found is added to 'runtimepath'. + If you have a directory under 'packpath' that doesn't + actually have a plugin file, just create an empty one. + This will still add the directory to 'runtimepath'. + Note that {name} is the directory name, not the name of the .vim file. If the "{name}/plugin" directory contains more than one file they are all sourced. @@ -564,7 +568,7 @@ Additionally, these commands can be used: About the additional commands in debug mode: - There is no command-line completion for them, you get the completion for the normal Ex commands only. -- You can shorten them, up to a single character, unless more then one command +- You can shorten them, up to a single character, unless more than one command starts with the same letter. "f" stands for "finish", use "fr" for "frame". - Hitting <CR> will repeat the previous one. When doing another command, this is reset (because it's not clear what you want to repeat). diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt index b0130a3ba..c982a99f6 100644 --- a/runtime/doc/starting.txt +++ b/runtime/doc/starting.txt @@ -1,4 +1,4 @@ -*starting.txt* For Vim version 7.4. Last change: 2016 Feb 21 +*starting.txt* For Vim version 7.4. Last change: 2016 Feb 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -414,9 +414,10 @@ a slash. Thus "-R" means recovery and "-/R" readonly. not needed, because Vim will be able to find out what type of terminal you are using. (See |terminal-info|.) {not in Vi} + *--not-a-term* --not-a-term Tells Vim that the user knows that the input and/or output is not connected to a terminal. This will avoid the warning and - the two second delay that would happen. + the two second delay that would happen. {not in Vi} *-d* -d Start in diff mode, like |vimdiff|. @@ -1152,7 +1153,7 @@ There are several ways to exit Vim: - Use `:cquit`. Also when there are changes. When using `:cquit` or when there was an error message Vim exits with exit -code 1. Errors can be avoide by using `:silent!`. +code 1. Errors can be avoided by using `:silent!`. ============================================================================== 8. Saving settings *save-settings* diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index 59caa1ad7..091168f3f 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.4. Last change: 2016 Feb 24 +*syntax.txt* For Vim version 7.4. Last change: 2016 Feb 25 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2890,7 +2890,7 @@ You may wish to embed languages into sh. I'll give an example courtesy of Lorance Stinson on how to do this with awk as an example. Put the following file into $HOME/.vim/after/syntax/sh/awkembed.vim: > - " AWK Embedding: {{{1 + " AWK Embedding: " ============== " Shamelessly ripped from aspperl.vim by Aaron Hope. if exists("b:current_syntax") diff --git a/runtime/doc/tags b/runtime/doc/tags index e28ee7181..061bc3195 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -1272,7 +1272,6 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* +scrollbind various.txt /*+scrollbind* +signs various.txt /*+signs* +smartindent various.txt /*+smartindent* -+sniff various.txt /*+sniff* +startuptime various.txt /*+startuptime* +statusline various.txt /*+statusline* +sun_workshop various.txt /*+sun_workshop* @@ -1323,6 +1322,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* --literal starting.txt /*--literal* --nofork starting.txt /*--nofork* --noplugin starting.txt /*--noplugin* +--not-a-term starting.txt /*--not-a-term* --remote remote.txt /*--remote* --remote-expr remote.txt /*--remote-expr* --remote-send remote.txt /*--remote-send* @@ -2860,8 +2860,6 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* :smile index.txt /*:smile* :sn windows.txt /*:sn* :snext windows.txt /*:snext* -:sni if_sniff.txt /*:sni* -:sniff if_sniff.txt /*:sniff* :sno change.txt /*:sno* :snomagic change.txt /*:snomagic* :snor map.txt /*:snor* @@ -3568,7 +3566,6 @@ D change.txt /*D* DOS os_dos.txt /*DOS* DOS-format editing.txt /*DOS-format* DOS-format-write editing.txt /*DOS-format-write* -DPMI os_msdos.txt /*DPMI* Dictionaries eval.txt /*Dictionaries* Dictionary eval.txt /*Dictionary* Dictionary-function eval.txt /*Dictionary-function* @@ -3761,12 +3758,7 @@ E270 if_ruby.txt /*E270* E271 if_ruby.txt /*E271* E272 if_ruby.txt /*E272* E273 if_ruby.txt /*E273* -E274 if_sniff.txt /*E274* -E275 if_sniff.txt /*E275* -E276 if_sniff.txt /*E276* E277 remote.txt /*E277* -E278 if_sniff.txt /*E278* -E279 if_sniff.txt /*E279* E28 syntax.txt /*E28* E280 if_tcl.txt /*E280* E281 if_tcl.txt /*E281* @@ -3949,11 +3941,6 @@ E447 editing.txt /*E447* E448 various.txt /*E448* E449 eval.txt /*E449* E45 message.txt /*E45* -E450 os_msdos.txt /*E450* -E451 os_msdos.txt /*E451* -E452 os_msdos.txt /*E452* -E453 os_msdos.txt /*E453* -E454 os_msdos.txt /*E454* E455 print.txt /*E455* E456 print.txt /*E456* E457 print.txt /*E457* @@ -4451,8 +4438,8 @@ E911 eval.txt /*E911* E912 eval.txt /*E912* E913 eval.txt /*E913* E914 eval.txt /*E914* -E915 channel.txt /*E915* E916 eval.txt /*E916* +E917 eval.txt /*E917* E92 message.txt /*E92* E93 windows.txt /*E93* E94 windows.txt /*E94* @@ -5176,6 +5163,9 @@ cc change.txt /*cc* ceil() eval.txt /*ceil()* ch.vim syntax.txt /*ch.vim* ch_close() eval.txt /*ch_close()* +ch_evalexpr() eval.txt /*ch_evalexpr()* +ch_evalraw() eval.txt /*ch_evalraw()* +ch_getbufnr() eval.txt /*ch_getbufnr()* ch_getjob() eval.txt /*ch_getjob()* ch_log() eval.txt /*ch_log()* ch_logfile() eval.txt /*ch_logfile()* @@ -5611,8 +5601,6 @@ dos-locations os_dos.txt /*dos-locations* dos-shell os_dos.txt /*dos-shell* dos-standard-mappings os_dos.txt /*dos-standard-mappings* dos-temp-files os_dos.txt /*dos-temp-files* -dos16 os_msdos.txt /*dos16* -dos32 os_msdos.txt /*dos32* dosbatch.vim syntax.txt /*dosbatch.vim* double-click term.txt /*double-click* download intro.txt /*download* @@ -7115,7 +7103,6 @@ message.txt message.txt /*message.txt* messages message.txt /*messages* meta intro.txt /*meta* min() eval.txt /*min()* -minimal-features os_msdos.txt /*minimal-features* missing-options vi_diff.txt /*missing-options* mkdir() eval.txt /*mkdir()* mlang.txt mlang.txt /*mlang.txt* @@ -7146,18 +7133,7 @@ mouse_win-variable eval.txt /*mouse_win-variable* movement intro.txt /*movement* ms-dos os_msdos.txt /*ms-dos* msdos os_msdos.txt /*msdos* -msdos-arrows os_msdos.txt /*msdos-arrows* -msdos-clipboard-limits os_msdos.txt /*msdos-clipboard-limits* -msdos-compiling os_msdos.txt /*msdos-compiling* -msdos-copy-paste os_msdos.txt /*msdos-copy-paste* -msdos-fname-extensions os_msdos.txt /*msdos-fname-extensions* -msdos-limitations os_msdos.txt /*msdos-limitations* -msdos-linked-files os_msdos.txt /*msdos-linked-files* -msdos-longfname os_msdos.txt /*msdos-longfname* msdos-mode gui_w32.txt /*msdos-mode* -msdos-problems os_msdos.txt /*msdos-problems* -msdos-termcap os_msdos.txt /*msdos-termcap* -msdos-versions os_msdos.txt /*msdos-versions* msql.vim syntax.txt /*msql.vim* mswin.vim gui_w32.txt /*mswin.vim* multi-byte mbyte.txt /*multi-byte* @@ -8044,10 +8020,6 @@ slice eval.txt /*slice* slow-fast-terminal term.txt /*slow-fast-terminal* slow-start starting.txt /*slow-start* slow-terminal term.txt /*slow-terminal* -sniff if_sniff.txt /*sniff* -sniff-commands if_sniff.txt /*sniff-commands* -sniff-compiling if_sniff.txt /*sniff-compiling* -sniff-intro if_sniff.txt /*sniff-intro* socket-interface channel.txt /*socket-interface* sort() eval.txt /*sort()* sorting change.txt /*sorting* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index f8f9104d8..ecfc9e517 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.4. Last change: 2016 Feb 24 +*todo.txt* For Vim version 7.4. Last change: 2016 Feb 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -35,10 +35,6 @@ not be repeated below, unless there is extra information. -------------------- Known bugs and current work ----------------------- +channel: -- don't free channel if there are callbacks. - netbeans channel leaks? -- job_stop() on MS-Windows: "term" should probably do the same as "kill". -- Make JSON encode and decode NaN and Infinity. - A callback on ch_sendraw() should be put at the end of the list of callback handlers. When a message arrives invoke the first one and remove it. - implement TODO items in ":help channel": @@ -72,11 +68,14 @@ not be repeated below, unless there is extra information. - Add a test where ["eval","getline(123)"] gets a line with special characters (NUL, 0x80, etc.). Check that it isn't garbled. - make sure errors lead to a useful error msg. ["ex","foobar"] -- json: implement UTF-16 surrogate pair. - For connection to server, a "keep open" flag would be useful. Retry connecting in the main loop with zero timeout. -Remove the sniff interface? Looks like it's dead. +For Win32 isinf() should be inline. (ZyX) + +Add ":packadd"? Like :loadplugin but only adds the dir to 'runtimepath'. + +emoji patch from Yasuhiro Matsumoto. More plugin support: - Have a way to install a callback from the main loop. Called every second or @@ -169,6 +168,9 @@ Feb 9) Patch to put undo options together in undo window. (Gary Johnson, 2016 Jan 28) +Patch to have better check for {action} argument of setqflist(). +Nikolai Pavlov, Feb 25, #661. Can be even more strict. + Patch for clearing history. (Yegappan Lakshmanan, 2016 Jan 31, second message has tests) @@ -1563,8 +1565,6 @@ still delete them. Also convert all buffer file names? Update src/testdir/main.aap. -"vim -c 'sniff connect'" hangs Vim. (Dominique Pelle, 2008 Dec 7) - Something wrong with session that has "cd" commands and "badd", in such a way that Vim doesn't find the edited file in the buffer list, causing the ATTENTION message? (Tony Mechelynck, 2008 Dec 1) diff --git a/runtime/doc/usr_29.txt b/runtime/doc/usr_29.txt index dc71e71dd..c6105cea9 100644 --- a/runtime/doc/usr_29.txt +++ b/runtime/doc/usr_29.txt @@ -1,4 +1,4 @@ -*usr_29.txt* For Vim version 7.4. Last change: 2008 Jun 28 +*usr_29.txt* For Vim version 7.4. Last change: 2016 Feb 27 VIM USER MANUAL - by Bram Moolenaar @@ -265,9 +265,6 @@ doesn't work if the tags file isn't sorted. The 'taglength' option can be used to tell Vim the number of significant characters in a tag. -When you use the SNiFF+ program, you can use the Vim interface to it |sniff|. -SNiFF+ is a commercial program. - Cscope is a free program. It does not only find places where an identifier is declared, but also where it is used. See |cscope|. diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt index 8fe47bb88..1bce66e65 100644 --- a/runtime/doc/various.txt +++ b/runtime/doc/various.txt @@ -1,4 +1,4 @@ -*various.txt* For Vim version 7.4. Last change: 2016 Feb 18 +*various.txt* For Vim version 7.4. Last change: 2016 Feb 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -411,7 +411,6 @@ m *+ruby/dyn* Ruby interface |ruby-dynamic| |/dyn| N *+scrollbind* |'scrollbind'| B *+signs* |:sign| N *+smartindent* |'smartindent'| -m *+sniff* SniFF interface |sniff| N *+startuptime* |--startuptime| argument N *+statusline* Options 'statusline', 'rulerformat' and special formats of 'titlestring' and 'iconstring' diff --git a/runtime/doc/version5.txt b/runtime/doc/version5.txt index e47fa43a4..5f2586dd2 100644 --- a/runtime/doc/version5.txt +++ b/runtime/doc/version5.txt @@ -1,4 +1,4 @@ -*version5.txt* For Vim version 7.4. Last change: 2016 Jan 03 +*version5.txt* For Vim version 7.4. Last change: 2016 Feb 27 VIM REFERENCE MANUAL by Bram Moolenaar @@ -934,7 +934,7 @@ Don't add "-L/usr/lib" to the link line, causes problems on a few systems. When compiling, allow a choice for minimal, normal or maximal features in an easy way, by changing a single line in src/feature.h. The DOS16 version has been compiled with minimal features to avoid running -out of memory too quickly. |dos16| +out of memory too quickly. The Win32, DJGPP, and OS/2 versions use maximal features, because they have enough memory. The Amiga version is available with normal and maximal features. diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim index 26d063524..b470e56f6 100644 --- a/runtime/syntax/fortran.vim +++ b/runtime/syntax/fortran.vim @@ -1,15 +1,16 @@ " Vim syntax file " Language: Fortran 2008 (and older: Fortran 2003, 95, 90, and 77) -" Version: 0.96 -" Last Change: 2015 Nov. 30 +" Version: 0.97 +" Last Change: 2016 Feb. 26 " 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 was based on the fortran 77 syntax file by Mario Eusebio and -" Preben Guldberg. Useful suggestions and contributions were made by: Andrej Panjkov, -" Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile, +" 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: +" Andrej Panjkov, Bram Moolenaar, Thomas Olsen, Michael Sternberg, Christian Reile, " Walter Dieudonné, Alexander Wagner, Roman Bertle, Charles Rendleman, -" Andrew Griffiths, Joe Krahn, Hendrik Merx, and Matt Thompson. +" Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, and Jan Hermann. if exists("b:current_syntax") finish @@ -407,7 +408,7 @@ if exists("fortran_fold") else syn region fortran77Loop transparent fold keepend start="\<do\s\+\z(\d\+\)" end="^\s*\z1\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData syn region fortran90Loop transparent fold keepend extend start="\(\<end\s\+\)\@<!\<do\(\s\+\a\|\s*$\)" skip="^\s*[!#].*$" excludenl end="\<end\s*do\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData - syn region fortranIfBlock transparent fold keepend extend start="\(\<e\(nd\|lse\)\s\+\)\@<!\<if\s*(.\+)\s*then\>" skip="^\s*[!#].*$" end="\<end\s*if\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData + syn region fortranIfBlock transparent fold keepend extend start="\(\<e\(nd\|lse\)\s\+\)\@<!\<if\s*(\(.\|&\s*\n\)\+)\(\s\|&\s*\n\)*then\>" skip="^\s*[!#].*$" end="\<end\s*if\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData syn region fortranCase transparent fold keepend extend start="\<select\s*case\>" skip="^\s*[!#].*$" end="\<end\s*select\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData endif endif |