diff options
57 files changed, 2248 insertions, 433 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index e723db5e81..2e3a47bd92 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1,4 +1,4 @@ -*autocmd.txt* For Vim version 7.0aa. Last change: 2004 Jun 30 +*autocmd.txt* For Vim version 7.0aa. Last change: 2004 Jul 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -486,6 +486,8 @@ InsertLeave When leaving Insert mode. Also when using *FileEncoding* FileEncoding Obsolete. It still works and is equivalent to |EncodingChanged|. + *ColorScheme* +ColorScheme After loading a color scheme. |:colorscheme| *RemoteReply* RemoteReply When a reply from a Vim that functions as server was received |server2client()|. diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt index 90b35b412d..4d4a88c633 100644 --- a/runtime/doc/cmdline.txt +++ b/runtime/doc/cmdline.txt @@ -1,4 +1,4 @@ -*cmdline.txt* For Vim version 7.0aa. Last change: 2004 Mar 31 +*cmdline.txt* For Vim version 7.0aa. Last change: 2004 Jul 01 VIM REFERENCE MANUAL by Bram Moolenaar @@ -45,12 +45,13 @@ thus you cannot edit beyond that. *cmdline-history* *history* The command-lines that you enter are remembered in a history table. You can -recall them with the up and down cursor keys. There are actually four +recall them with the up and down cursor keys. There are actually five history tables: - one for ':' commands - one for search strings - one for expressions - one for input lines, typed for the |input()| function. +- one for debug mode commands These are completely separate. Each history can only be accessed when entering the same type of line. Use the 'history' option to set the number of lines that are remembered @@ -305,6 +306,7 @@ terminals) s[earch] or / search string history e[xpr] or = expression register history i[nput] or @ input line history + d[ebug] or > debug command history a[ll] all of the above {not in Vi} diff --git a/runtime/doc/gui_x11.txt b/runtime/doc/gui_x11.txt index 3e3a8e40cc..8dee2a2bdd 100644 --- a/runtime/doc/gui_x11.txt +++ b/runtime/doc/gui_x11.txt @@ -1,4 +1,4 @@ -*gui_x11.txt* For Vim version 7.0aa. Last change: 2004 Mar 16 +*gui_x11.txt* For Vim version 7.0aa. Last change: 2004 Jul 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -435,7 +435,7 @@ the WM to identify the window by restoring the window role (using the |--role| command line argument). ============================================================================== -7. KDE version *gui-kde* *KDE* *KVim* +7. KDE version *gui-kde* *kde* *KDE* *KVim* The KDE version of Vim works with KDE 2.x and KDE 3.x. KVim (name code for gui-kde) does not use traditional X settings for its diff --git a/runtime/doc/hangulin.txt b/runtime/doc/hangulin.txt index c1133cb97a..2fadb5b909 100644 --- a/runtime/doc/hangulin.txt +++ b/runtime/doc/hangulin.txt @@ -96,6 +96,6 @@ Bug or Comment Send comments, patches and suggestions to: Chi-Deok Hwang <hwang@mizi.co.kr> - Nam SungHyun <namsh@lge.com> + Nam SungHyun <namsh@kldp.org> vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 77fe085b5b..d313cf262b 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.0aa. Last change: 2004 Jun 16 +*index.txt* For Vim version 7.0aa. Last change: 2004 Jul 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -89,7 +89,7 @@ tag char action ~ |i_CTRL-V_digit| CTRL-V {number} insert three digit decimal number as a single byte. |i_CTRL-W| CTRL-W delete word before the cursor -|i_CTRL-X| CTRL-X {mode} enter CTRL-X sub mode, see below +|i_CTRL-X| CTRL-X {mode} enter CTRL-X sub mode, see |i_CTRL-X_index| |i_CTRL-Y| CTRL-Y insert the character which is above the cursor |i_CTRL-Z| CTRL-Z when 'insertmode' set: suspend Vim |i_<Esc>| <Esc> end insert mode (unless 'insertmode' set) @@ -141,7 +141,7 @@ tag char action ~ |i_<MouseUp>| <MouseUp> scroll three lines upwards |i_<S-MouseUp>| <S-MouseUp> scroll a full page upwards -commands in CTRL-X submode +commands in CTRL-X submode *i_CTRL-X_index* |i_CTRL-X_CTRL-D| CTRL-X CTRL-D complete defined identifiers |i_CTRL-X_CTRL-E| CTRL-X CTRL-E scroll up @@ -153,6 +153,8 @@ commands in CTRL-X submode |i_CTRL-X_CTRL-P| CTRL-X CTRL-P previous completion |i_CTRL-X_CTRL-T| CTRL-X CTRL-T complete identifiers from thesaurus |i_CTRL-X_CTRL-Y| CTRL-X CTRL-Y scroll down +|i_CTRL-X_CTRL-U| CTRL-X CTRL-U complete with 'completefunc' +|i_CTRL-X_CTRL-V| CTRL-X CTRL-V complete like in : command line |i_CTRL-X_CTRL-]| CTRL-X CTRL-] complete tags {not available when compiled without the +insert_expand feature} @@ -449,6 +451,8 @@ These can be used after an operator or in Visual mode to select an object. tag command action in Normal mode ~ ------------------------------------------------------------------------------ +|v_aquote| a" double quoted string +|v_a'| a' single quoted string |v_a(| a( same as ab |v_a)| a) same as ab |v_a<| a< "a <>" from '<' to the matching '>' @@ -457,12 +461,15 @@ tag command action in Normal mode ~ |v_aW| aW "a WORD" (with white space) |v_a[| a[ "a []" from '[' to the matching ']' |v_a]| a] same as a[ +|v_a`| a` string in backticks |v_ab| ab "a block" from "[(" to "])" (with braces) |v_ap| ap "a paragraph" (with white space) |v_as| as "a sentence" (with white space) |v_aw| aw "a word" (with white space) |v_a{| a{ same as aB |v_a}| a} same as aB +|v_iquote| i" double quoted string without the quotes +|v_i'| i' single quoted string without the quotes |v_i(| i( same as ib |v_i)| i) same as ib |v_i<| i< "inner <>" from '<' to the matching '>' @@ -471,6 +478,7 @@ tag command action in Normal mode ~ |v_iW| iW "inner WORD" |v_i[| i[ "inner []" from '[' to the matching ']' |v_i]| i] same as i[ +|v_i`| i` string in backticks without the backticks |v_ib| ib "inner block" from "[(" to "])" |v_ip| ip "inner paragraph" |v_is| is "inner sentence" diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 7e13134d70..da8f177367 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.0aa. Last change: 2004 Jun 24 +*insert.txt* For Vim version 7.0aa. Last change: 2004 Jul 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -854,6 +854,23 @@ CTRL-X CTRL-V Guess what kind of item is in front of the cursor and completion, for example: > :imap <Tab> <C-X><C-V> +User defined completing *compl-function* + +Completion is done by a function that can be defined by the user with the +'completefunc' option. See the option for how the function is called and an +example. + + *i_CTRL-X_CTRL-U* +CTRL-X CTRL-U Guess what kind of item is in front of the cursor and + find the first match for it. + CTRL-U or + CTRL-N Use the next match. This match replaces the previous + one. + + CTRL-P Use the previous match. This match replaces the + previous one. + + Completing keywords from different sources *compl-generic* *i_CTRL-N* diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt index 9e96c3ea49..5766984b80 100644 --- a/runtime/doc/mbyte.txt +++ b/runtime/doc/mbyte.txt @@ -1360,7 +1360,7 @@ options.txt for detailed information. Contributions specifically for the multi-byte features by: Chi-Deok Hwang <hwang@mizi.co.kr> - Nam SungHyun <namsh@lge.com> + Nam SungHyun <namsh@kldp.org> K.Nagano <nagano@atese.advantest.co.jp> Taro Muraoka <koron@tka.att.ne.jp> Yasuhiro Matsumoto <mattn@mail.goo.ne.jp> diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt index b2f6858bbe..a3e73b3946 100644 --- a/runtime/doc/motion.txt +++ b/runtime/doc/motion.txt @@ -1,4 +1,4 @@ -*motion.txt* For Vim version 7.0aa. Last change: 2004 Jun 17 +*motion.txt* For Vim version 7.0aa. Last change: 2004 Jul 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -597,6 +597,26 @@ iB "inner Block", select [count] Blocks, from "[count] [{" |[{|). When used in Visual mode it is made characterwise. +a" *v_aquote* *aquote* +a' *v_a'* *a'* +a` *v_a`* *a`* + "a quoted string". Selects the text from the previous + quote until the next quote. The 'quoteescape' is used + to skip escaped quotes. + When the cursor starts on a quote, Vim will figure out + which quote pairs form a string by searching from the + start of the line. + Any trailing or leading white space is included. + When used in Visual mode it is made characterwise. + Repeating this object in Visual mode another string is + included. A count is currently not used. + +i" *v_iquote* *iquote* +i' *v_i'* *i'* +i` *v_i`* *i`* + Like a", a' and a`, but exclude the quotes and + repeating won't extend the Visual selection. + When used after an operator: For non-block objects: For the "a" commands: The operator applies to the object and the white diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index bfaad469dc..44b4d7b6df 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0aa. Last change: 2004 Jun 28 +*options.txt* For Vim version 7.0aa. Last change: 2004 Jul 02 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1514,6 +1514,51 @@ A jump table for the options with a short description can be found at |Q_op|. based expansion (eg dictionary |i_CTRL-X_CTRL-K|, included patterns |i_CTRL-X_CTRL-I|, tags |i_CTRL-X_CTRL-]| and normal expansions) + *'completefunc'* *'cfu'* +'completefunc' 'cfu' string (default: empty) + local to buffer + {not in Vi} + This option specifies a completion function to be used for CTRL-X + CTRL-X. The function will be invoked with four arguments: + a:line the text of the current line + a:base the text with which matches should match + a:col column in a:line where the cursor is, first column is + zero + a:findstart either 1 or 0 + When the a:findstart argument is 1, the function must return the + column of where the completion starts. It must be a number between + zero and "a:col". This involves looking at the characters in a:line + before column a:col and include those characters that could be part of + the completed item. + When the a:findstart argument is 0 the function must return a string + with the matching words, separated by newlines. When there are no + matches return an empty string. + An example that completes the names of the months: > + fun! CompleteMonths(line, base, col, findstart) + if a:findstart + " locate start column of word + let start = a:col + while start > 0 && a:line[start - 1] =~ '\a' + let start = start - 1 + endwhile + return start + else + " find months matching with "a:base" + let res = "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec" + if a:base != '' + let res = substitute(res, '\c\<\(\(' . a:base . '.\{-}\>\)\|.\{-}\>\)', '\2', 'g') + endif + let res = substitute(res, ' \+', "\n", 'g') + return res + endif + endfun + set completefunc=CompleteMonths +< Note that a substitute() function is used to reduce the list of + possible values and remove the ones that don't match the base. The + part before the "\|" matches the base, the part after it is used + when there is no match. The "\2" in the replacement is empty if the + part before the "\|" does not match. + *'confirm'* *'cf'* *'noconfirm'* *'nocf'* 'confirm' 'cf' boolean (default off) global @@ -3082,6 +3127,7 @@ A jump table for the options with a short description can be found at |Q_op|. hidden although the 'hidden' option is off: When the buffer is modified, 'autowrite' is off or writing is not possible, and the '!' flag was used. See also |windows.txt|. + To only make one buffer hidden use the 'bufhidden' option. This option is set for one command with ":hide {command}" |:hide|. WARNING: It's easy to forget that you have changes in hidden buffers. Think twice when using ":q!" or ":qa!". @@ -3835,6 +3881,8 @@ A jump table for the options with a short description can be found at |Q_op|. precedes:c Character to show in the first column, when 'wrap' is off and there is text preceding the character visible in the first column. + nbsp:c Character to show for non-breakable space. Left to + blank when omitted. The characters ':' and ',' should not be used. UTF-8 characters can be used when 'encoding' is "utf-8", otherwise only printable @@ -3842,10 +3890,10 @@ A jump table for the options with a short description can be found at |Q_op|. Examples: > :set lcs=tab:>-,trail:- - :set lcs=tab:>-,eol:< + :set lcs=tab:>-,eol:<,nbsp:% :set lcs=extends:>,precedes:< < The "NonText" highlighting will be used for "eol", "extends" and - "precedes". "SpecialKey" for "tab" and "trail". + "precedes". "SpecialKey" for "nbsp", "tab" and "trail". *'lpl'* *'nolpl'* *'loadplugins'* *'noloadplugins'* 'loadplugins' 'lpl' boolean (default on) @@ -4652,6 +4700,16 @@ A jump table for the options with a short description can be found at |Q_op|. Example: > :set printoptions=paper:letter,duplex:off < + *'quoteescape''* *'qe'* +'quoteescape' 'qe' string (default "\") + local to buffer + {not in Vi} + The characters that are used to escape quotes in a string. Used for + objects like a', a" and a` |a'|. + When one of the characters in this option is found inside a string, + the following character will be skipped. The default value makes the + text "foo\"bar\\" considered to be one string. + *'readonly'* *'ro'* *'noreadonly'* *'noro'* 'readonly' 'ro' boolean (default off) local to buffer diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt index 8112af86b6..5e28ed62c9 100644 --- a/runtime/doc/pi_netrw.txt +++ b/runtime/doc/pi_netrw.txt @@ -17,6 +17,20 @@ 5. Ex Commands.........................................|netrw-ex| 6. Variables and Options...............................|netrw-var| 7. Remote Directory Browser............................|netrw-browse| + ?..........Help....................................|netrw-help| + <cr>.......Browsing................................|netrw-cr| + <c-l>......Refreshing the Listing..................|netrw-c-l| + <del>......Removing Files or Directories...........|netrw-delete| + D..........Removing Files or Directories...........|netrw-D| + R..........Renaming Files or Directories...........|netrw-R| + -..........Going Up................................|netrw--| + a..........Hiding Files or Directories.............|netrw-a| + h..........Edit File/Directory Hiding..............|netrw-h| + o..........Browsing with a Horizontal Split........|netrw-o| + r..........Reversing Sorting Order.................|netrw-r| + s..........Selecting Sorting Style.................|netrw-s| + v..........Browsing with a Vertical Split..........|netrw-v| + x..........Customizing Browsing....................|netrw-x| 8. Debugging...........................................|netrw-debug| 9. History.............................................|netrw-history| 10. Credits.............................................|netrw-credits| @@ -414,6 +428,7 @@ variables listed below, and may be modified by the user. g:netrw_sftp_cmd variable ="sftp" > ------------------------------------------------------------------------- < + *netrw-ftp* The first two options both help with certain ftp's that give trouble otherwise. In order to best understand how to use these options if ftp is giving you troubles, a bit of discussion follows on how netrw does ftp reads. @@ -455,6 +470,11 @@ requested it and the temporary file deleted. If your ftp doesn't accept the "user" command and immediately just demands a userid, then try putting "let netrw_ftp=1" in your <.vimrc>. + *netrw-cadaver* +To handle the SSL certificate dialog for untrusted servers, one may pull +down the certificate and place it into /usr/ssl/cert.pem. This operation +renders the server treatment as "trusted". + *netrw-fixup* If your ftp for whatever reason generates unwanted lines (such as AUTH messages) you may write a NetReadFixup(tmpfile) function: @@ -493,24 +513,26 @@ from <netrw.vim> itself: > ============================================================================== -7. Remote Directory Browser *netrw-browse* *netrw-dir* *netrw-list* +7. Remote Directory Browser *netrw-browse* *netrw-dir* *netrw-list* *netrw-help* > - ------- ----------- Command Explanation ------- ----------- + ? Causes Netrw to issue help <cr> Netrw will enter the directory or read the file <del> Netrw will attempt to remove the file/directory + <c-l> Causes Netrw to refresh the directory listing D Netrw will attempt to remove the file(s)/directory(ies) R Netrw will attempt to rename the file(s)/directory(ies) - Makes Netrw go up one directory a Show all of a directory (temporarily ignore g:netrw_list_hide) + h Edit file hiding list o Enter the file/directory under the cursor in a new browser window. A horizontal split is used. + r Reverse sorting order + s Select sorting style: by name, time, or file size v Enter the file/directory under the cursor in a new browser window. A vertical split is used. x Apply a function to a file. - <c-l> Causes Netrw to refresh the directory listing - ? Causes Netrw to issue help < *netrw-browse-var* > @@ -524,18 +546,38 @@ from <netrw.vim> itself: g:netrw_winsize specify initial size of new o/v windows g:netrw_list_hide comma separated list of patterns for hiding files + g:netrw_sort_by sort by "name", "time", or "size" + g:netrw_sort_direction sorting direction: "normal" or "reverse" + g:netrw_sort_sequence when sorting by name, first sort by the + comma-separated pattern sequence < +INTRODUCTION TO REMOTE DIRECTORY BROWSING + Netrw supports the browsing of directories on remote hosts, including -generating listing directories, entering directories, editing files -therein, deleting files/directories, and moving (renaming) files and -directories. +generating listing directories, entering directories, editing files therein, +deleting files/directories, and moving (renaming) files and directories. The +Netrw browser generally implements the file explorer methods but for remote +directories, although details (such as pertinent global variable names) +necessarily differ. To enter the netrw directory browser, simply attempt to read a "file" with a trailing slash and it will be interpreted as a request to list a directory: vim [protocol]://[user@]hostname/path/ -Netrw will modify the command in g:netrw_list_cmd to perform the directory + +REFRESHING THE LISTING *netrw-c-l* + +To refresh the directory listing, press ctrl-l (<c-l>) or hit the <cr> +when atop the ./ directory entry in the listing. + + +GOING UP *netrw--* + +To go up a directory, press - or his the <cr> when atop the ../ directory +entry in the listing. + +Netrw will modify the command in *g:netrw_list_cmd* to perform the directory listing operation. By default the command is: ssh HOSTNAME ls -FLa @@ -545,58 +587,121 @@ to read. Naturally, the user may override this command with whatever is preferred. The NetList function which implements remote directory browsing expects that directories will be flagged by a trailing slash. + +BROWSING *netrw-cr* + Browsing is simple: move the cursor onto a file or directory of interest. Hitting the <cr> (the return key) will select the file or directory. Directories will themselves be listed, and files will be opened using the protocol given in the original read request. - *netrw-delete* *netrw-remove* -Deleting/removing files and directories involves moving the cursor to the -file/directory to be deleted and pressing "D". Directories must be empty -first before they can be successfully removed. If the directory is a softlink -to a directory, then netrw will make two requests to remove the directory -before succeeding. Netrw will ask for confirmation before doing the -removal(s). You may select a range of lines with the "V" command (visual -selection), and then pressing "D". +REMOVING FILES OR DIRECTORIES *netrw-delete* *netrw-remove* *netrw-D* -The g:netrw_rm_cmd, g:netrw_rmf_cmd, and g:netrw_rmdir_cmd variables are -used to control the attempts to remove files and directories. The -g:netrw_rm_cmd is used with files, and its default value is: +Deleting/removing files and directories involves moving the cursor to the +file/directory to be deleted and pressing "D". Directories must be empty first +before they can be successfully removed. If the directory is a softlink to a +directory, then netrw will make two requests to remove the directory before +succeeding. Netrw will ask for confirmation before doing the removal(s). +You may select a range of lines with the "V" command (visual selection), +and then pressing "D". + + *g:netrw_rm_cmd* +The g:netrw_rm_cmd, g:netrw_rmf_cmd, and g:netrw_rmdir_cmd variables are used +to control the attempts to remove files and directories. The g:netrw_rm_cmd +is used with files, and its default value is: g:netrw_rm_cmd: ssh HOSTNAME rm -The g:netrw_rmdir_cmd is used with directories. Its default value is: + *g:netrw_rmdir_cmd* +The g:netrw_rmdir_cmd variable is used to support the removal of directories. +Its default value is: g:netrw_rmdir_cmd: ssh HOSTNAME rmdir + *g:netrw_rmf_cmd* If removing a directory fails with g:netrw_rmdir_cmd, netrw then will attempt -to remove it again using the g:netrw_rmf_cmd. Its default value is: +to remove it again using the g:netrw_rmf_cmd variable. Its default value is: g:netrw_rmf_cmd: ssh HOSTNAME rm -f - *netrw-x* - -The Netrw executor applies a user-defined function to a file, based on its -extension. Of course, the handler function must exist for it to be called. -> - Ex. mypgm.html x -> NetrwFileHandler_html("scp://user@host/some/path/mypgm.html") -< -See the <NetrwFileHandlers.vim> - *netrw-move* *netrw-rename* +RENAMING FILES OR DIRECTORIES *netrw-move* *netrw-rename* Renaming/moving files and directories involves moving the cursor to the file/directory to be moved (renamed) and pressing "R". You will then be queried for where you want the file/directory to be moved. You may select a range of lines with the "V" command (visual selection), and then pressing "R". -The g:netrw_rename_cmd is used to implement renaming. By default its +The g:netrw_rename_cmd variable is used to implement renaming. By default its value is: ssh HOSTNAME mv - *netrw-list-hack* + +HIDING FILES OR DIRECTORIES *g:netrw_a* *g:netrw_list_hide* + +The "a" map lets the browser ignore the g:netrw_list_hide variable. Normally +the g:netrw_list_hide variable holds a comma separated list of patterns which +will be hidden (removed) from the directory listing. + + +EDIT FILE OR DIRECTORY HIDING *netrw-h* + +The "h" map brings up a requestor allowing the user to change the +file/directory hiding list. + + +BROWSING WITH A HORIZONTALLY SPLIT WINDOW *netrw-o* + +Normally one enters a file or directory using the <cr>. However, the "o" +map allows one to open a new window to hold the new directory listing or +file. A horizontal split is used. (also see |netrw-v|) + + +SELECTING SORTING STYLE *netrw-s* + +One may select the sorting style by name, time, or (file) size. The +"s" map allows one to circulate among the three choices; the directory +listing will automatically be refreshed to reflect the selected style. + + +REVERSING SORTING ORDER *netrw-r* + +One may toggle between normal and reverse sorting order by pressing the +"r" key. + + +BROWSING WITH A VERTICALLY SPLIT WINDOW *netrw-v* + +Normally o |