diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-08-26 19:52:37 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-08-26 19:52:37 +0200 |
commit | e4a3bcf28d92d0bde9ca227ccb40d401038185e5 (patch) | |
tree | 276387ac4364fdee74b72c2503fc4505e8728043 /runtime | |
parent | dd74ab9b464f3d1a5f6f6395469b76f8e0e6dccd (diff) |
Updated runtime files. Add Scala files.
Diffstat (limited to 'runtime')
33 files changed, 1400 insertions, 427 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 69fa6e89b7..1da05fbd6c 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.4. Last change: 2016 Aug 18 +*eval.txt* For Vim version 7.4. Last change: 2016 Aug 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -7305,7 +7305,7 @@ strwidth({expr}) *strwidth()* Ambiguous, this function's return value depends on 'ambiwidth'. Also see |strlen()|, |strdisplaywidth()| and |strchars()|. -submatch({nr}[, {list}]) *submatch()* +submatch({nr}[, {list}]) *submatch()* *E935* Only for an expression in a |:substitute| command or substitute() function. Returns the {nr}'th submatch of the matched text. When {nr} diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index c657790617..9a50f2671f 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 7.4. Last change: 2016 Apr 08 +*gui_x11.txt* For Vim version 7.4. Last change: 2016 Aug 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -421,6 +421,9 @@ These are the different looks: GNOME is compiled with if it was found by configure and the --enable-gnome-check argument was used. +Note: Avoid use of --enable-gnome-check with GTK+ 3 GUI build. The +functionality mentioned above is consolidated in GTK+ 3. + GNOME session support *gui-gnome-session* *gnome-session* @@ -457,20 +460,37 @@ continues on Yzis: https://github.com/chrizel/Yzis. ============================================================================== 8. Compiling *gui-x11-compiling* -If using X11, Vim's Makefile will by default first try to find the necessary -GTK+ files on your system. If the GTK+ files cannot be found, then the Motif -files will be searched for. Finally, if this fails, the Athena files will be -searched for. If all three fail, the GUI will be disabled. +If using X11, Vim's configure will by default first try to find the necessary +GTK+ files on your system. When both GTK+ 2 and GTK+ 3 are available, GTK+ 2 +will be chosen unless --enable-gui=gtk3 is passed explicitly to configure. + +If the GTK+ files cannot be found, then the Motif files will be searched for. +Finally, if this fails, the Athena files will be searched for. If all three +fail, the GUI will be disabled. + +For GTK+, Vim's configuration process uses pkg-config(1) to check if the +GTK+ required for a specified build is properly installed and usable. +Accordingly, it is a good idea to make sure before running configure that +your system has a working pkg-config together with the .pc file of the +required GTK+. For that, say, run the following on the command line to see if +your pkg-config works with your GTK+ 2: > + + $ pkgconfig --modversion gtk+-2.0 -For GTK+, Vim's configuration process requires that GTK+ be properly -installed. That is, the shell script 'gtk-config' must be in your PATH, and -you can already successful compile, build, and execute a GTK+ program. The -reason for this is that the compiler flags (CFLAGS) and link flags (LDFLAGS) -are obtained through the 'gtk-config' shell script. +Replace gtk+-2.0 with gtk+-3.0 for GTK+ 3. If you get the correct version +number of your GTK+, you can proceed; if not, you probably need to do some +system administration chores to set up pkg-config and GTK+ correctly. -If you want to build with GTK+ 2 support pass the --enable-gtk2-check argument -to ./configure. Optionally, support for GNOME 2 will be compiled if the ---enable-gnome-check option is also given. +The GTK+ 2 GUI is built by default. Therefore, you usually don't need to pass +any options such as --enable-gui=gtk2 to configure and build that. + +Optionally, the GTK+ 2 GUI can consolidate the GNOME 2 support. This support +is enabled by passing --enable-gnome-check to configure. + +If you want to build the GTK+ 3 GUI, you have to pass --enable-gui=gtk3 +explicitly to configure, and avoid passing --enable-gnome-check to that, as +the functionality of the GNOME 2 support has already been consolidated in +GTK+ 3. Otherwise, if you are using Motif or Athena, when you have the Motif or Athena files in a directory where configure doesn't look, edit the Makefile to enter @@ -478,18 +498,14 @@ the names of the directories. Search for "GUI_INC_LOC" for an example to set the Motif directories, "CONF_OPT_X" for Athena. *gui-x11-gtk* -At the time of this writing, GTK+ version 1.0.6 and 1.2 are outdated. It -is suggested that you use GTK 2. The GTK 1 support will most likely be -dropped soon. - -For the GTK+ 2 GUI, using the latest release of the GTK+ 2.0 or GTK+ 2.2 -series is recommended. - -Lastly, although GTK+ has supposedly been ported to the Win32 platform, this -has not been tested with Vim and is also unsupported. Also, it's unlikely to -even compile since GTK+ GUI uses parts of the generic X11 code. This might -change in distant future; particularly because getting rid of the X11 centric -code parts is also required for GTK+ framebuffer support. +Currently, Vim supports both GTK+ 2 and GTK+ 3. + +The GTK+ 2 GUI requires GTK+ 2.2 or later. + +Although the GTK+ 3 GUI is written in such a way that the source code can be +compiled against all versions of the 3.x series, we recommend GTK+ 3.10 or +later because of its substantial implementation changes in redraw done at +that version. *gui-x11-motif* For Motif, you need at least Motif version 1.2 and/or X11R5. Motif 2.0 and diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 5ee7351be8..6c9f456834 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 Aug 16 +*index.txt* For Vim version 7.4. Last change: 2016 Aug 24 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1239,6 +1239,7 @@ tag command action ~ |:file| :f[ile] show or set the current file name |:files| :files list all files in the buffer list |:filetype| :filet[ype] switch file type detection on/off +|:filter| :filt[er] filter output of following command |:find| :fin[d] find file in 'path' and edit it |:finally| :fina[lly] part of a :try command |:finish| :fini[sh] quit sourcing a Vim script diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index c531168e39..67b04313bc 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.4. Last change: 2016 Aug 14 +*options.txt* For Vim version 7.4. Last change: 2016 Aug 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4319,6 +4319,8 @@ A jump table for the options with a short description can be found at |Q_op|. original position when no match is found and when pressing <Esc>. You still need to finish the search command with <Enter> to move the cursor to the match. + You can use the CTRL-N and CTRL-P keys to move to the next and + previous match. |c_CTRL-N| |c_CTRL-P| When compiled with the |+reltime| feature Vim only searches for about half a second. With a complicated pattern and/or a lot of text the match may not be found. This is to avoid that Vim hangs while you @@ -4632,7 +4634,7 @@ A jump table for the options with a short description can be found at |Q_op|. be able to execute Normal mode commands. This is the opposite of the 'keymap' option, where characters are mapped in Insert mode. - Also consider setting 'langnoremap' to avoid 'langmap' applies to + Also consider resetting 'langremap' to avoid 'langmap' applies to characters resulting from a mapping. This option cannot be set from a |modeline| or in the |sandbox|, for security reasons. @@ -4695,10 +4697,20 @@ A jump table for the options with a short description can be found at |Q_op|. {not in Vi} {only available when compiled with the |+langmap| feature} - When on, setting 'langmap' does not apply to characters resulting from + This is just like 'langremap' but with the value inverted. It only + exists for backwards compatibility. When setting 'langremap' then + 'langnoremap' is set to the inverted value, and the other way around. + + *'langremap'* *'lrm'* *'nolangremap'* *'nolrm'* +'langremap' 'lrm' boolean (default on, reset in |defaults.vim|) + global + {not in Vi} + {only available when compiled with the |+langmap| + feature} + When off, setting 'langmap' does not apply to characters resulting from a mapping. This basically means, if you noticed that setting - 'langmap' disables some of your mappings, try setting this option. - This option defaults to off for backwards compatibility. Set it on if + 'langmap' disables some of your mappings, try resetting this option. + This option defaults to on for backwards compatibility. Set it off if that works for you to avoid mappings to break. *'laststatus'* *'ls'* @@ -6245,6 +6257,8 @@ A jump table for the options with a short description can be found at |Q_op|. "inclusive" means that the last character of the selection is included in an operation. For example, when "x" is used to delete the selection. + When "old" is used and 'virtualedit' allows the cursor to move past + the end of line the line break still isn't included. Note that when "exclusive" is used and selecting from the end backwards, you cannot include the last character of a line, when starting in Normal mode and 'virtualedit' empty. diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt index c105d82297..1e35b808f1 100644 --- a/runtime/doc/quickref.txt +++ b/runtime/doc/quickref.txt @@ -1,4 +1,4 @@ -*quickref.txt* For Vim version 7.4. Last change: 2016 Aug 12 +*quickref.txt* For Vim version 7.4. Last change: 2016 Aug 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -767,7 +767,7 @@ Short explanation of each option: *option-list* 'keywordprg' 'kp' program to use for the "K" command 'langmap' 'lmap' alphabetic characters for other language mode 'langmenu' 'lm' language to be used for the menus -'langnoremap' 'lnr' do not apply 'langmap' to mapped characters +'langremap' 'lrm' do apply 'langmap' to mapped characters 'laststatus' 'ls' tells when last window has status lines 'lazyredraw' 'lz' don't redraw while executing macros 'linebreak' 'lbr' wrap long lines at a blank diff --git a/runtime/doc/tags b/runtime/doc/tags index b000d32c11..791df4164f 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -400,6 +400,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* 'langmap' options.txt /*'langmap'* 'langmenu' options.txt /*'langmenu'* 'langnoremap' options.txt /*'langnoremap'* +'langremap' options.txt /*'langremap'* 'laststatus' options.txt /*'laststatus'* 'lazyredraw' options.txt /*'lazyredraw'* 'lbr' options.txt /*'lbr'* @@ -416,6 +417,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* 'lnr' options.txt /*'lnr'* 'loadplugins' options.txt /*'loadplugins'* 'lpl' options.txt /*'lpl'* +'lrm' options.txt /*'lrm'* 'ls' options.txt /*'ls'* 'lsp' options.txt /*'lsp'* 'luadll' options.txt /*'luadll'* @@ -586,6 +588,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* 'nojoinspaces' options.txt /*'nojoinspaces'* 'nojs' options.txt /*'nojs'* 'nolangnoremap' options.txt /*'nolangnoremap'* +'nolangremap' options.txt /*'nolangremap'* 'nolazyredraw' options.txt /*'nolazyredraw'* 'nolbr' options.txt /*'nolbr'* 'nolinebreak' options.txt /*'nolinebreak'* @@ -594,6 +597,7 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* 'nolnr' options.txt /*'nolnr'* 'noloadplugins' options.txt /*'noloadplugins'* 'nolpl' options.txt /*'nolpl'* +'nolrm' options.txt /*'nolrm'* 'nolz' options.txt /*'nolz'* 'noma' options.txt /*'noma'* 'nomacatsui' options.txt /*'nomacatsui'* @@ -1593,6 +1597,9 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* /\{- pattern.txt /*\/\\{-* /\~ pattern.txt /*\/\\~* /^ pattern.txt /*\/^* +/_CTRL-L cmdline.txt /*\/_CTRL-L* +/_CTRL-N cmdline.txt /*\/_CTRL-N* +/_CTRL-P cmdline.txt /*\/_CTRL-P* /atom pattern.txt /*\/atom* /bar pattern.txt /*\/bar* /branch pattern.txt /*\/branch* @@ -2267,6 +2274,8 @@ $VIM_POSIX vi_diff.txt /*$VIM_POSIX* :filetype-overview filetype.txt /*:filetype-overview* :filetype-plugin-off filetype.txt /*:filetype-plugin-off* :filetype-plugin-on filetype.txt /*:filetype-plugin-on* +:filt various.txt /*:filt* +:filter various.txt /*:filter* :fin editing.txt /*:fin* :fina eval.txt /*:fina* :finally eval.txt /*:finally* @@ -4475,6 +4484,7 @@ E931 message.txt /*E931* E932 eval.txt /*E932* E933 eval.txt /*E933* E934 sign.txt /*E934* +E935 eval.txt /*E935* E94 windows.txt /*E94* E95 message.txt /*E95* E96 diff.txt /*E96* @@ -9217,6 +9227,7 @@ window-size term.txt /*window-size* window-size-functions usr_41.txt /*window-size-functions* window-tag windows.txt /*window-tag* window-variable eval.txt /*window-variable* +windowid windows.txt /*windowid* windowid-variable eval.txt /*windowid-variable* windows windows.txt /*windows* windows-3.1 os_win32.txt /*windows-3.1* @@ -9226,6 +9237,7 @@ windows-starting windows.txt /*windows-starting* windows.txt windows.txt /*windows.txt* windows95 os_win32.txt /*windows95* winheight() eval.txt /*winheight()* +winid windows.txt /*winid* winline() eval.txt /*winline()* winnr() eval.txt /*winnr()* winrestcmd() eval.txt /*winrestcmd()* diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt index b8ab153674..5163de8128 100644 --- a/runtime/doc/tagsrch.txt +++ b/runtime/doc/tagsrch.txt @@ -1,4 +1,4 @@ -*tagsrch.txt* For Vim version 7.4. Last change: 2013 Oct 01 +*tagsrch.txt* For Vim version 7.4. Last change: 2016 Aug 20 VIM REFERENCE MANUAL by Bram Moolenaar @@ -454,9 +454,9 @@ The next file in the list is not used when: This also depends on whether case is ignored. Case is ignored when: - 'tagcase' is "followic" and 'ignorecase' is set - 'tagcase' is "ignore" -- 'tagcase' is "smart" and and the pattern only contains lower case +- 'tagcase' is "smart" and the pattern only contains lower case characters. -- 'tagcase' is "followscs" and 'smartcase' is set and and the pattern only +- 'tagcase' is "followscs" and 'smartcase' is set and the pattern only contains lower case characters. If case is not ignored, and the tags file only has a match without matching case, the next tags file is searched for a match with matching case. If no @@ -833,24 +833,24 @@ CTRL-W d Open a new window, with the cursor on the first *:search-args* Common arguments for the commands above: -[!] When included, find matches in lines that are recognized as comments. - When excluded, a match is ignored when the line is recognized as a - comment (according to 'comments'), or the match is in a C comment (after - "//" or inside /* */). Note that a match may be missed if a line is - recognized as a comment, but the comment ends halfway the line. - And if the line is a comment, but it is not recognized (according to - 'comments') a match may be found in it anyway. Example: > +[!] When included, find matches in lines that are recognized as comments. + When excluded, a match is ignored when the line is recognized as a + comment (according to 'comments'), or the match is in a C comment + (after "//" or inside /* */). Note that a match may be missed if a + line is recognized as a comment, but the comment ends halfway the line. + And if the line is a comment, but it is not recognized (according to + 'comments') a match may be found in it anyway. Example: > /* comment foobar */ -< A match for "foobar" is found, because this line is not recognized as a - comment (even though syntax highlighting does recognize it). - Note: Since a macro definition mostly doesn't look like a comment, the - [!] makes no difference for ":dlist", ":dsearch" and ":djump". -[/] A pattern can be surrounded by '/'. Without '/' only whole words are - matched, using the pattern "\<pattern\>". Only after the second '/' a - next command can be appended with '|'. Example: > +< A match for "foobar" is found, because this line is not recognized as + a comment (even though syntax highlighting does recognize it). + Note: Since a macro definition mostly doesn't look like a comment, the + [!] makes no difference for ":dlist", ":dsearch" and ":djump". +[/] A pattern can be surrounded by '/'. Without '/' only whole words are + matched, using the pattern "\<pattern\>". Only after the second '/' a + next command can be appended with '|'. Example: > :isearch /string/ | echo "the last one" -< For a ":djump", ":dsplit", ":dlist" and ":dsearch" command the pattern - is used as a literal string, not as a search pattern. +< For a ":djump", ":dsplit", ":dlist" and ":dsearch" command the pattern + is used as a literal string, not as a search pattern. vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 53e8b7e762..b4e2193cc9 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 Aug 18 +*todo.txt* For Vim version 7.4. Last change: 2016 Aug 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -34,7 +34,13 @@ not be repeated below, unless there is extra information. *known-bugs* -------------------- Known bugs and current work ----------------------- -Rename 'langnoremap' to 'langremap' and invert the value? +Make ":filter" work with more commands. + +C highlighting: modern C allows /* comment */ #ifdef + +Ramel Eshed: system() is much slower than job_start(), why? (Aug 26) + +Error in viminfo. (John Chen, 2016 Aug 26, #1010) +channel: - Check that raw mode does NL-NUL conversion. @@ -55,6 +61,8 @@ Later With xterm could use -S{pty}. Regexp problems: +- The new engine does not do the example in change.txt correctly, where the + meaning of \1 and \2 is explained. (Harm te Hennepe, #990) - Since 7.4.704 the old regex engine fails to match [[:print:]] in 0xf6. (Manuel Ortega, 2016 Apr 24) Test fails on Mac. Avoid using isalpha(), isalnum(), etc? Depends on @@ -138,6 +146,8 @@ Invalid behavior with NULL list. (Nikolai Pavlov, #768) For current Windows build .pdb file is missing. (Gabriele Fava, 2016 May 11) 5) +Patch to fix compiler warning with gtk3. (Kazunobu Kuriyama, 2016 Aug 24) + Problem with whitespace in errorformat. (Gerd Wachsmuth, 2016 May 15, #807) Undo problem: "g-" doesn't go back, gets stuck. (Björn Linse, 2016 Jul 18) @@ -157,6 +167,9 @@ Jul 25, #948) 'hlsearch' interferes with a Conceal match. (Rom Grk, 2016 Aug 9) +Patch to add context information to quickfix/location list. (Yegappan +Lakshmanan, 2016 Aug 25) + MS-Windows: use WS_HIDE instead of SW_SHOWMINNOACTIVE in os_win32.c? Otherwise task flickers in taskbar. @@ -165,23 +178,9 @@ Also for ":@.". Repeating 'opfunc' in a function only works once. (Tarmean, 2016 Jul 15, #925) -Patch on issue #728 by Christian Brabandt, 2016 Apr 7. Update with test: Apr 8. -Explanation Apr 12. - Second problem in #966: ins_compl_add_tv() uses get_dict_string() multiple times, overwrites the one buffer. (Nikolay Pavlov, 2016 Aug 5) -Patch to add 'topbot' to 'belloff' option. (Coot, 2016 Mar 18, #695) - -Patch for C syntax HL. (Bradley Garagan, 2016 Apr 17) #763 - -Patch to make matchit work better, respect 'matchpairs'. (Ken Takata, 2016 Mar -25) - -Patch to fix that on suckless Terminal mousewheel up does not work. -(Ralph Eastwood, 2013 Nov 25) -Patch for mouse support on suckless Terminal. #971 Manuel Schiller - This does not work: :set cscopequickfix=a- (Linewi, 2015 Jul 12, #914) @@ -260,6 +259,9 @@ Problem using ":try" inside ":execute". (ZyX, 2013 Sep 15) Patch to make tests pass with EBCDIC. (Owen Leibman, 2016 Apr 10) +Add ":read :command", to insert the output of an Ex command? +Can already do it with ":$put =execute('command')". + When repeating the 'confirm' dialog one needs to press Enter. (ds26gte, 2016 Apr 17) #762 @@ -289,6 +291,14 @@ Also need to run update-desktop-database (Kuriyama Kazunobu, 2015 Nov 4) Patch to test popupmenu. Fails, possibly due to a bug. (Christian Brabandt, 2016 Jul 23) +Patch to introduce 'cmdencoding'. (Ken Takata, Aug 18?) +Better help Aug 19. +Problem: applies to too many commands, such as :cbuffer. +Should there be a different value for :make and :grep? + Win32: When running ":make" and 'encoding' differs from the system locale, + the output should be converted. Esp. when 'encoding' is "utf-8". (Yongwei + Wu) Should we use 'termencoding' for this? + Patch to have text objects defined by arbitrary single characters. (Daniel Thau, 2013 Nov 20, 2014 Jan 29, 2014 Jan 31) Added tests (James McCoy, 2016 Aug 3). Still needs more work. @@ -317,9 +327,6 @@ Patch to avoid redrawing tabline when the popup menu is visible. Patch to add {skip} argument to search(). (Christian Brabandt, 2016 Feb 24) Update 2016 Jun 10, #861 -Add value "smart" to 'tagcase': ignore case when tag is all lower case. -Patch from Christian Brabandt, 2016 Mar 30, #712. - Patch to be able to use hex numbers with :digraph. (Lcd, 2015 Sep 6) Update Sep 7. Update by Christian Brabandt, 2015 Sep 8, 2016 Feb 1. @@ -544,8 +551,6 @@ Should be easy to highlight all matches with 'incsearch'. Idea by Itchyny, Wrong scrolling when using incsearch. Patch by Christian Brabandt, 2014 Dec 4. Is this a good solution? -Patch to add /pattern/ to :oldfiles. Pull #575. - Patch: Let rare word highlighting overrule good word highlighting. (Jakson A. Aquino, 2010 Jul 30, again 2011 Jul 2) @@ -2217,10 +2222,6 @@ only set after Visual moded is ended. Also add a variable for the Visual mode. So that this mode and '< '> can be used to set what "gv" selects. (Ben Schmidt) -Win32: When running ":make" and 'encoding' differs from the system locale, the -output should be converted. Esp. when 'encoding' is "utf-8". (Yongwei Wu) -Should we use 'termencoding' for this? - Win32, NTFS: When editing a specific infostream directly and 'backupcopy' is "auto" should detect this situation and work like 'backupcopy' is "yes". File name is something like "c:\path\foo.txt:bar", includes a colon. (Alex diff --git a/runtime/doc/version8.txt b/runtime/doc/version8.txt index 1be8b831be..1fb092aea6 100644 --- a/runtime/doc/version8.txt +++ b/runtime/doc/version8.txt @@ -1,4 +1,4 @@ -*version8.txt* For Vim version 8.0. Last change: 2016 Aug 18 +*version8.txt* For Vim version 8.0. Last change: 2016 Aug 26 VIM REFERENCE MANUAL by Bram Moolenaar @@ -141,8 +141,10 @@ This adds the 'renderoptions' option to allow for switching on DirectX GTK+ 3 support ~ -GTK+ 2 is getting old, GTK+ 3 is here. Support has been added and it already -works quite well, mostly just like GTK+ 2. +The GTK+ 3 GUI works just like GTK+ 2 except for hardly noticeable technical +differences between them. Configure still chooses GTK+ 2 if both 2 and 3 are +available. See src/Makefile for how to use GTK+ 3 instead. See +|gui-x11-compiling| for other details. Vim script enhancements *new-vim-script-8* @@ -165,15 +167,6 @@ Many items were added so support |new-style-testing|. Various new items *new-items-8* ----------------- -Normal mode commands: ~ - -|g+| g+ go to newer text state N times -|g,| g, go to N newer position in change list -|g-| g- go to older text state N times -|g;| g; go to N older position in change list -|g_| g_ cursor to the last CHAR N - 1 lines lower - - Visual mode commands: ~ |v_CTRL-A| CTRL-A add N to number in highlighted text @@ -194,7 +187,7 @@ Options: ~ 'breakindentopt' settings for 'breakindent'. 'emoji' emoji characters are considered full width 'fixendofline' make sure last line in file has <EOL> -'langnoremap' do not apply 'langmap' to mapped characters +'langremap' do apply 'langmap' to mapped characters 'luadll' name of the Lua dynamic library 'packpath' list of directories used for packages 'perldll' name of the Perl dynamic library @@ -396,6 +389,7 @@ Rmd (markdown with R code chunks) syntax and indent Rmd ftplugin Rnoweb ftplugin Rnoweb indent +Scala syntax and indent and ftplugin SystemVerilog syntax and indent and ftplugin Systemd syntax and indent and ftplugin Teraterm (TTL) syntax and indent @@ -12884,7 +12878,7 @@ Files: src/search.c, src/testdir/Make_all.mak, src/Makefile, src/testdir/test_gn.vim Patch 7.4.2101 -Problem: Looping over windows, buffers and tab pages is inconsistant. +Problem: Looping over windows, buffers and tab pages is inconsistent. Solution: Use FOR_ALL_ macros everywhere. (Yegappan Lakshmanan) Files: src/buffer.c, src/diff.c, src/edit.c, src/eval.c, src/evalfunc.c, src/ex_cmds.c, src/ex_cmds2.c, src/ex_docmd.c, src/fileio.c, diff --git a/runtime/doc/vim.man b/runtime/doc/vim.man index 9390caa0d6..cb0057a1f5 100644 --- a/runtime/doc/vim.man +++ b/runtime/doc/vim.man @@ -222,7 +222,7 @@ OPTIONS -R Read-only mode. The 'readonly' option will be set. You can still edit the buffer, but will be prevented from acci‐ - dently overwriting a file. If you do want to overwrite a + dentally overwriting a file. If you do want to overwrite a file, add an exclamation mark to the Ex command, as in ":w!". The -R option also implies the -n option (see below). The 'readonly' option can be reset with ":set diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index 81042dbcdf..7700269795 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 7.4. Last change: 2016 Aug 18 +*windows.txt* For Vim version 7.4. Last change: 2016 Aug 23 VIM REFERENCE MANUAL by Bram Moolenaar @@ -75,7 +75,7 @@ places where a Normal mode command can't be used or is inconvenient. The main Vim window can hold several split windows. There are also tab pages |tab-page|, each of which can hold multiple windows. - *window-ID* + *window-ID* *winid* *windowid* Each window has a unique identifier called the window ID. This identifier will not change within a Vim session. The |win_getid()| and |win_id2tabwin()| functions can be used to convert between the window/tab number and the @@ -1042,6 +1042,10 @@ list of buffers. |unlisted-buffer| h+ hidden buffers which are modified a+ active buffers which are modified + When using |:filter| the pattern is matched against the + displayed buffer name, e.g.: > + filter /\.vim/ ls +< *:bad* *:badd* :bad[d] [+lnum] {fname} Add file name {fname} to the buffer list, without loading it. diff --git a/runtime/filetype.vim b/runtime/filetype.vim index e46ad515c9..4fc42753c4 100644 --- a/runtime/filetype.vim +++ b/runtime/filetype.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2016 Aug 18 +" Last Change: 2016 Aug 26 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -692,8 +692,8 @@ func! s:FTe() let n = 1 while n < 100 && n < line("$") if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$" - setf specman - return + setf specman + return endif let n = n + 1 endwhile @@ -1780,6 +1780,9 @@ au BufNewFile,BufRead *.sass setf sass " Sather au BufNewFile,BufRead *.sa setf sather +" Scala +au BufNewFile,BufRead *.scala setf scala + " Scilab au BufNewFile,BufRead *.sci,*.sce setf scilab @@ -2052,7 +2055,7 @@ func! s:FTRules() if line =~ s:ft_rules_udev_rules_pattern let udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "") if dir == udev_rules - setf udevrules + setf udevrules endif break endif @@ -2301,7 +2304,7 @@ au BufNewFile,BufRead */etc/updatedb.conf setf updatedb au BufNewFile,BufRead */usr/share/upstart/*.conf setf upstart au BufNewFile,BufRead */usr/share/upstart/*.override setf upstart au BufNewFile,BufRead */etc/init/*.conf,*/etc/init/*.override setf upstart -au BufNewFile,BufRead */.init/*.conf,*/.init/*.override setf upstart +au BufNewFile,BufRead */.init/*.conf,*/.init/*.override setf upstart au BufNewFile,BufRead */.config/upstart/*.conf setf upstart au BufNewFile,BufRead */.config/upstart/*.override setf upstart diff --git a/runtime/ftplugin/rmd.vim b/runtime/ftplugin/rmd.vim index ec64a07675..8c092ac13f 100644 --- a/runtime/ftplugin/rmd.vim +++ b/runtime/ftplugin/rmd.vim @@ -1,9 +1,9 @@ " Vim filetype plugin file -" Language: R help file +" Language: R Markdown file " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com> " Homepage: https://github.com/jalvesaq/R-Vim-runtime -" Last Change: Tue Apr 07, 2015 04 |