From 166af9bb6f4f0c9a2f570766d26b42d2041860f2 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 16 Nov 2010 20:34:40 +0100 Subject: Updated runtime files. --- runtime/doc/arabic.txt | 4 +- runtime/doc/diff.txt | 6 +-- runtime/doc/eval.txt | 4 +- runtime/doc/gui.txt | 42 +++++++++---------- runtime/doc/insert.txt | 10 +++-- runtime/doc/intro.txt | 6 +-- runtime/doc/map.txt | 24 ++++++----- runtime/doc/options.txt | 14 ++++--- runtime/doc/pi_tar.txt | 14 +++---- runtime/doc/quotes.txt | 23 ++++++----- runtime/doc/syntax.txt | 83 +++++++++++++++++++++++++------------ runtime/doc/tags | 2 + runtime/doc/todo.txt | 105 ++++++++++++++++++++++++++++++----------------- runtime/doc/usr_01.txt | 17 +++++--- runtime/doc/usr_41.txt | 3 +- runtime/doc/various.txt | 3 +- runtime/doc/version7.txt | 4 +- runtime/doc/vim2html.pl | 2 +- 18 files changed, 222 insertions(+), 144 deletions(-) (limited to 'runtime/doc') diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt index 7a4bfaaa8..16674cab9 100644 --- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -1,4 +1,4 @@ -*arabic.txt* For Vim version 7.3. Last change: 2005 Mar 29 +*arabic.txt* For Vim version 7.3. Last change: 2010 Nov 13 VIM REFERENCE MANUAL by Nadim Shaikli @@ -146,7 +146,7 @@ o Enable Arabic settings [short-cut] :set arabic < The two above noted possible invocations are the preferred manner - in which users are instructed to proceed. Baring an enabled 'termbidi' + in which users are instructed to proceed. Barring an enabled 'termbidi' setting, both command options: 1. set the appropriate keymap diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt index becbeb362..d9dc24d52 100644 --- a/runtime/doc/diff.txt +++ b/runtime/doc/diff.txt @@ -1,4 +1,4 @@ -*diff.txt* For Vim version 7.3. Last change: 2010 Sep 30 +*diff.txt* For Vim version 7.3. Last change: 2010 Nov 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -373,8 +373,8 @@ get an error message. Possible causes: If it's not clear what the problem is set the 'verbose' option to one or more to see more messages. -The self-installing Vim includes a diff program. If you don't have it you -might want to download a diff.exe. For example from +The self-installing Vim for MS-Windows includes a diff program. If you don't +have it you might want to download a diff.exe. For example from http://jlb.twu.net/code/unixkit.php. diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index ec6686cb3..4f4092b8d 100644 --- a/runtime/doc/eval.txt +++ b/runtime/doc/eval.txt @@ -1,4 +1,4 @@ -*eval.txt* For Vim version 7.3. Last change: 2010 Oct 27 +*eval.txt* For Vim version 7.3. Last change: 2010 Nov 13 VIM REFERENCE MANUAL by Bram Moolenaar @@ -4017,7 +4017,7 @@ maparg({name}[, {mode} [, {abbr} [, {dict}]]]) *maparg()* characters will be used: " " Normal, Visual and Operator-pending "!" Insert and Commandline mode - (|mapmpde-ic|) + (|mapmode-ic|) "sid" The script local ID, used for mappings (||). diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt index f9bbf78d2..213f455cc 100644 --- a/runtime/doc/gui.txt +++ b/runtime/doc/gui.txt @@ -1,4 +1,4 @@ -*gui.txt* For Vim version 7.3. Last change: 2010 May 14 +*gui.txt* For Vim version 7.3. Last change: 2010 Nov 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -156,26 +156,26 @@ configure which ones appear with the 'guioptions' option. The interface looks like this (with ":set guioptions=mlrb"): - +------------------------------+ - | File Edit Help | <- Menu bar (m) - +-+--------------------------+-+ - |^| |^| - |#| Text area. |#| - | | | | - |v|__________________________|v| - Normal status line -> |-+ File.c 5,2 +-| - between Vim windows |^|""""""""""""""""""""""""""|^| - | | | | - | | Another file buffer. | | - | | | | - |#| |#| - Left scrollbar (l) -> |#| |#| <- Right - |#| |#| scrollbar (r) - | | | | - |v| |v| - +-+--------------------------+-+ - | |< #### >| | <- Bottom - +-+--------------------------+-+ scrollbar (b) + +------------------------------+ ` + | File Edit Help | <- Menu bar (m) ` + +-+--------------------------+-+ ` + |^| |^| ` + |#| Text area. |#| ` + | | | | ` + |v|__________________________|v| ` + Normal status line -> |-+ File.c 5,2 +-| ` + between Vim windows |^|""""""""""""""""""""""""""|^| ` + | | | | ` + | | Another file buffer. | | ` + | | | | ` + |#| |#| ` + Left scrollbar (l) -> |#| |#| <- Right ` + |#| |#| scrollbar (r) ` + | | | | ` + |v| |v| ` + +-+--------------------------+-+ ` + | |< #### >| | <- Bottom ` + +-+--------------------------+-+ scrollbar (b) ` Any of the scrollbar or menu components may be turned off by not putting the appropriate letter in the 'guioptions' string. The bottom scrollbar is diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 3c0f8d326..4ee1c79b8 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.3. Last change: 2010 Oct 27 +*insert.txt* For Vim version 7.3. Last change: 2010 Nov 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1037,6 +1037,8 @@ items: items that only differ in case are added dup when non-zero this match will be added even when an item with the same word is already present. + empty when non-zero this match will be added even when it is + an empty string All of these except 'icase' must be a string. If an item does not meet these requirements then an error message is given and further items in the list are @@ -1064,9 +1066,9 @@ match to the total list. These matches should then not appear in the returned list! Call |complete_check()| now and then to allow the user to press a key while still searching for matches. Stop searching when it returns non-zero. -The function is allowed to move the cursor, it is restored afterwards. This -option cannot be set from a |modeline| or in the |sandbox|, for security -reasons. + *E839* *E840* +The function is allowed to move the cursor, it is restored afterwards. +The function is not allowed to move to another window or delete text. An example that completes the names of the months: > fun! CompleteMonths(findstart, base) diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt index 7519365de..c8a32c3ac 100644 --- a/runtime/doc/intro.txt +++ b/runtime/doc/intro.txt @@ -1,4 +1,4 @@ -*intro.txt* For Vim version 7.3. Last change: 2010 Sep 29 +*intro.txt* For Vim version 7.3. Last change: 2010 Nov 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -703,7 +703,7 @@ Lines longer than the window width will wrap, unless the 'wrap' option is off (see below). The 'linebreak' option can be set to wrap at a blank character. If the window has room after the last line of the buffer, Vim will show '~' in -the first column of the last lines in the window, like this: > +the first column of the last lines in the window, like this: +-----------------------+ |some line | @@ -715,7 +715,7 @@ the first column of the last lines in the window, like this: > Thus the '~' lines indicate that the end of the buffer was reached. If the last line in a window doesn't fit, Vim will indicate this with a '@' in -the first column of the last lines in the window, like this: > +the first column of the last lines in the window, like this: +-----------------------+ |first line | diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index 055d33383..c18eed104 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.3. Last change: 2010 Sep 29 +*map.txt* For Vim version 7.3. Last change: 2010 Nov 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1093,16 +1093,20 @@ is executed, it is transformed into a normal Ex command and then executed. For starters: See section |40.2| in the user manual. - *E183* *user-cmd-ambiguous* + *E183* *E841* *user-cmd-ambiguous* All user defined commands must start with an uppercase letter, to avoid -confusion with builtin commands. (There are a few builtin commands, notably -:Next, :Print and :X, which do start with an uppercase letter. The builtin -will always take precedence in these cases). The other characters of the user -command can be uppercase letters, lowercase letters or digits. When using -digits, note that other commands that take a numeric argument may become -ambiguous. For example, the command ":Cc2" could be the user command ":Cc2" -without an argument, or the command ":Cc" with argument "2". It is advised to -put a space between the command name and the argument to avoid these problems. +confusion with builtin commands. Exceptions are these builtin commands: + :Next + :X +They cannot be used for a user defined command. ":Print" is also an existing +command, but it is deprecated and can be overruled. + +The other characters of the user command can be uppercase letters, lowercase +letters or digits. When using digits, note that other commands that take a +numeric argument may become ambiguous. For example, the command ":Cc2" could +be the user command ":Cc2" without an argument, or the command ":Cc" with +argument "2". It is advised to put a space between the command name and the +argument to avoid these problems. When using a user-defined command, the command can be abbreviated. However, if an abbreviation is not unique, an error will be issued. Furthermore, a diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 12bedd591..db3ea35d6 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3. Last change: 2010 Oct 23 +*options.txt* For Vim version 7.3. Last change: 2010 Nov 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1699,7 +1699,8 @@ A jump table for the options with a short description can be found at |Q_op|. with CTRL-X CTRL-U. |i_CTRL-X_CTRL-U| See |complete-functions| for an explanation of how the function is invoked and what it should return. - + This option cannot be set from a |modeline| or in the |sandbox|, for + security reasons. *'completeopt'* *'cot'* 'completeopt' 'cot' string (default: "menu,preview") @@ -2843,6 +2844,7 @@ A jump table for the options with a short description can be found at |Q_op|. "dos" is not present or no is found in the file. Except: if "unix" was chosen, but there is a before the first , and there appear to be more s than s in + the first few lines, "mac" is used. 4. If 'fileformat' is still not set, the first name from 'fileformats' is used. When reading a file into an existing buffer, the same is done, but @@ -6230,8 +6232,9 @@ A jump table for the options with a short description can be found at |Q_op|. Do smart autoindenting when starting a new line. Works for C-like programs, but can also be used for other languages. 'cindent' does something like this, works better in most cases, but is more strict, - see |C-indenting|. When 'cindent' is on, setting 'si' has no effect. - 'indentexpr' is a more advanced alternative. + see |C-indenting|. When 'cindent' is on or 'smartindent' is set, + setting 'si' has no effect. 'indentexpr' is a more advanced + alternative. Normally 'autoindent' should also be on when using 'smartindent'. An indent is automatically inserted: - After a line ending in '{'. @@ -7533,8 +7536,7 @@ A jump table for the options with a short description can be found at |Q_op|. with an uppercase letter, and don't contain a lowercase letter. Thus "KEEPTHIS and "K_L_M" are stored, but "KeepThis" and "_K_L_M" are not. Nested List and Dict items may not be - read back correctly, you end up with a string representation - instead. + read back correctly, you end up with an empty item. " Maximum number of lines saved for each register. Old name of the '<' item, with the disadvantage that you need to put a backslash before the ", otherwise it will be recognized as the diff --git a/runtime/doc/pi_tar.txt b/runtime/doc/pi_tar.txt index cc6a5d74f..d24de0932 100644 --- a/runtime/doc/pi_tar.txt +++ b/runtime/doc/pi_tar.txt @@ -1,4 +1,4 @@ -*pi_tar.txt* For Vim version 7.3. Last change: 2010 Aug 09 +*pi_tar.txt* For Vim version 7.3. Last change: 2010 Nov 03 +====================+ | Tar File Interface | @@ -60,11 +60,11 @@ Copyright 2005-2010: The GPL (gnu public license) applies to *tar-copyright* <.vimrc> file. Default Variable Value Explanation - *g:tar_browseoptions* "Ptf" used to get a list of contents - *g:tar_readoptions* "OPxf" used to extract a file from a tarball - *g:tar_cmd* "tar" the name of the tar program - *g:tar_nomax* 0 if true, file window will not be maximized - *g:tar_secure* undef if exists: + *g:tar_browseoptions* "Ptf" used to get a list of contents + *g:tar_readoptions* "OPxf" used to extract a file from a tarball + *g:tar_cmd* "tar" the name of the tar program + *g:tar_nomax* 0 if true, file window will not be maximized + *g:tar_secure* undef if exists: "--"s will be used to prevent unwanted option expansion in tar commands. Please be sure that your tar command @@ -76,7 +76,7 @@ Copyright 2005-2010: The GPL (gnu public license) applies to *tar-copyright* "-" Not all tar's support the "--" which is why it isn't default. - *g:tar_writeoptions* "uf" used to update/replace a file + *g:tar_writeoptions* "uf" used to update/replace a file ============================================================================== diff --git a/runtime/doc/quotes.txt b/runtime/doc/quotes.txt index ef600691d..d9bca590b 100644 --- a/runtime/doc/quotes.txt +++ b/runtime/doc/quotes.txt @@ -1,4 +1,4 @@ -*quotes.txt* For Vim version 7.3. Last change: 2006 Apr 24 +*quotes.txt* For Vim version 7.3. Last change: 2010 Nov 03 VIM REFERENCE MANUAL by Bram Moolenaar @@ -260,15 +260,16 @@ Eccettuato, Italy) In summary: - __ ___ _ _ _ ___ _____ - \ \ / (_)_ __ ___ (_)___ | | | |/ _ \_ _| - \ \ / /| | '_ ` _ \ | / __| | |_| | | | || | - \ V / | | | | | | | | \__ \ | _ | |_| || | - \_/ |_|_| |_| |_| |_|___/ |_| |_|\___/ |_| - ____ _____ _ _ _____ _____ _ _ - / ___|_ _| | | | ___| ___| | | - \___ \ | | | | | | |_ | |_ | | | - ___) || | | |_| | _| | _| |_|_| - |____/ |_| \___/|_| |_| (_|_) (Tony Nugent, Australia) + __ ___ _ _ _ ___ _____ ` + \ \ / (_)_ __ ___ (_)___ | | | |/ _ \_ _| ` + \ \ / /| | '_ ` _ \ | / __| | |_| | | | || | ` + \ V / | | | | | | | | \__ \ | _ | |_| || | ` + \_/ |_|_| |_| |_| |_|___/ |_| |_|\___/ |_| ` + ____ _____ _ _ _____ _____ _ _ ` + / ___|_ _| | | | ___| ___| | | ` + \___ \ | | | | | | |_ | |_ | | | ` + ___) || | | |_| | _| | _| |_|_| ` + |____/ |_| \___/|_| |_| (_|_) (Tony Nugent, Australia) ` + vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index b7a3fb68d..ae1e08def 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -1,4 +1,4 @@ -*syntax.txt* For Vim version 7.3. Last change: 2010 Sep 23 +*syntax.txt* For Vim version 7.3. Last change: 2010 Oct 7 VIM REFERENCE MANUAL by Bram Moolenaar @@ -390,10 +390,10 @@ Or use the ":TOhtml" user command. It is defined in a standard plugin. :10,40TOhtml -Warning: This is slow! The script must process every character of every line. -Because it is so slow, by default a progress bar is displayed in the -statusline for each step that usually takes a long time. If you don't like -seeing this progress bar, you can disable it and get a very minor speed +Warning: This can be slow! The script must process every character of every +line. Because it can take a long time, by default a progress bar is displayed +in the statusline for each major step in the conversion process. If you don't +like seeing this progress bar, you can disable it and get a very minor speed improvement with: > let g:html_no_progress = 1 @@ -475,40 +475,69 @@ risk of making some things look a bit different, use: > This will use
at the end of each line and use " " for repeated spaces. -The current value of 'encoding' is used to specify the charset of the HTML -file. This only works for those values of 'encoding' that have an equivalent -HTML charset name. To overrule this set g:html_use_encoding to the name of -the charset to be used: > - :let g:html_use_encoding = "foobar" -To omit the line that specifies the charset, set g:html_use_encoding to an -empty string: > +For diff mode on a single file (with g:html_diff_one_file) a sequence of more +than 3 filler lines is displayed as three lines with the middle line +mentioning the total number of inserted lines. If you prefer to see all the +inserted lines as with the side-by-side diff, use: > + :let g:html_whole_filler = 1 +And to go back to displaying up to three lines again: > + :unlet g:html_whole_filler +< +TOhtml uses the current value of 'fileencoding' if set, or 'encoding' if not, +to determine the charset and 'fileencoding' of the HTML file. In general, this +works for the encodings mentioned specifically by name in |encoding-names|, but +TOhtml will only automatically use those encodings which are widely supported. +However, you can override this to support specific encodings that may not be +automatically detected by default. + +To overrule all automatic charset detection, set g:html_use_encoding to the +name of the charset to be used. TOhtml will try to determine the appropriate +'fileencoding' setting from the charset, but you may need to set it manually +if TOhtml cannot determine the encoding. It is recommended to set this +variable to something widely supported, like UTF-8, for anything you will be +hosting on a webserver: > + :let g:html_use_encoding = "UTF-8" +You can also use this option to omit the line that specifies the charset +entirely, by setting g:html_use_encoding to an empty string: > :let g:html_use_encoding = "" To go back to the automatic mechanism, delete the g:html_use_encoding variable: > :unlet g:html_use_encoding + +If you specify a charset with g:html_use_encoding for which TOhtml cannot +automatically detect the corresponding 'fileencoding' setting, you can use +g:html_encoding_override to allow TOhtml to detect the correct encoding. +This is a dictionary of charset-encoding pairs that will replace existing +pairs automatically detected by TOhtml, or supplement with new pairs. For +example, to allow TOhtml to detect the HTML charset "windows-1252" properly as +the encoding "8bit-cp1252", use: > + :let g:html_encoding_override = {'windows-1252': '8bit-cp1252'} < -For diff mode a sequence of more than 3 filler lines is displayed as three -lines with the middle line mentioning the total number of inserted lines. If -you prefer to see all the inserted lines use: > - :let g:html_whole_filler = 1 -And to go back to displaying up to three lines again: > - :unlet g:html_whole_filler -< +The g:html_charset_override is similar, it allows TOhtml to detect the HTML +charset for any 'fileencoding' or 'encoding' which is not detected +automatically. You can also use it to override specific existing +encoding-charset pairs. For example, TOhtml will by default use UTF-8 for all +Unicode/UCS encodings. To use UTF-16 and UTF-32 instead, use: > + :let g:html_charset_override = {'ucs-4': 'UTF-32', 'utf-16': 'UTF-16'} + +Note that documents encoded in either UTF-32 or UTF-16 have known +compatibility problems with at least one major browser. + *convert-to-XML* *convert-to-XHTML* -An alternative is to have the script generate XHTML (XML compliant HTML). To -do this set the "html_use_xhtml" variable: > +If you do not like plain HTML, an alternative is to have the script generate +XHTML (XML compliant HTML). To do this set the "html_use_xhtml" variable: > :let g:html_use_xhtml = 1 -Any of these options can be enabled or disabled by setting them explicitly to -the desired value, or restored to their default by removing the variable using -|:unlet|. +Any of the on/off options listed above can be enabled or disabled by setting +them explicitly to the desired value, or restored to their default by removing +the variable using |:unlet|. Remarks: -- This only works in a version with GUI support. If the GUI is not actually - running (possible for X11) it still works, but not very well (the colors - may be wrong). - Some truly ancient browsers may not show the background colors. - From most browsers you can also print the file (in color)! +- This version of TOhtml may work with older versions of Vim, but some + features such as conceal support will not function, and the colors may be + incorrect for an old Vim without GUI support compiled in. Here is an example how to run the script over all .c and .h files from a Unix shell: > diff --git a/runtime/doc/tags b/runtime/doc/tags index eb7bb8bc9..c64874c70 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -4216,7 +4216,9 @@ E835 options.txt /*E835* E836 if_pyth.txt /*E836* E837 if_pyth.txt /*E837* E838 netbeans.txt /*E838* +E839 insert.txt /*E839* E84 windows.txt /*E84* +E840 insert.txt /*E840* E85 options.txt /*E85* E86 windows.txt /*E86* E87 windows.txt /*E87* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index aa4c207b1..caa2fddbf 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3. Last change: 2010 Oct 27 +*todo.txt* For Vim version 7.3. Last change: 2010 Nov 16 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,7 +30,11 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -Segfault with command line abbreviation. (Randy Morris, 2010 Oct 25) +Crash when using vimgrep with an ftp file. (Christian Brabandt, 2010 Nov 5) +Crash with dragn-n-drop of file combined with netrw (Marius Gedminas, 2008 Jun +11) I can't reproduce it. It's probably caused by a handle_drop() call +in combination with autocommands that invoke a ":redraw" command. +Another valgrind output Jun 30. 'cursorline' is displayed too short when there are concealed characters and 'list' is set, 'listchars' at default value. (Dennis Preiser, 2010 Aug 15) @@ -38,6 +42,10 @@ Segfault with command line abbreviation. (Randy Morris, 2010 Oct 25) Conceal: using Tab for cchar causes problems. Should reject it. (ZyX, 2010 Aug 25) +Problems with building after 7.3.050, -as-needed does not work for gcc 4.4.1? +(Charles Campbell, 2010 Nov 7) Or is the problem that we should use -ltinfo, +because nothing is used from ncurses? + Syntax region with 'concealends' and a 'cchar' value, 'conceallevel' set to 2, only one of the two ends gets the cchar displayed. (Brett Stahlman, 2010 Aug 21, Ben Fritz, 2010 Sep 14) @@ -56,53 +64,42 @@ Using ":break" or something else that stops executing commands inside a ":finally" does not rethrow a previously uncaught exception. (ZyX, 2010 Oct 15) -Patch for 2html to support 'fileencoding'. (Benjamin Fritz, 2010 Sep 10) -Beta testing finished now? - -Three patches for undo persistence. (Christian Brabandt, 2010 Sep 4) - -Patch to adjust mzscheme to support racket. (Sergey Khorev, 2010 Oct 24) - string() can't parse back "inf" and "nan". Fix documentation or fix code? (ZyX, 2010 Aug 23) -Patch to use "--as-needed" instead of the link.sh functionality. (Kirill A. -Shutemov, 2010 Aug 25) - -ml_get error for using :copen in a custom complete function. (Xavier -Deguillard, 2010 Oct 19) Other way to reproduce it by Lech Lorens, Oct 20. -Patch from Lech: Oct 20. More problems from Lech, Oct 21. - -Patch to fix complete(). (Kikuchan, 2010 Oct 15) - maparg() does not show the