diff options
42 files changed, 2216 insertions, 284 deletions
diff --git a/README.txt b/README.txt index 7674299d01..fda27ec63c 100644 --- a/README.txt +++ b/README.txt @@ -5,9 +5,9 @@ WHAT IS VIM Vim is an almost compatible version of the UNIX editor Vi. Many new features have been added: multi-level undo, syntax highlighting, command line history, -on-line help, filename completion, block operations, etc. There is also a -Graphical User Interface (GUI) available. See "runtime/doc/vi_diff.txt" for -differences with Vi. +on-line help, spell checking, filename completion, block operations, etc. +There is also a Graphical User Interface (GUI) available. See +"runtime/doc/vi_diff.txt" for differences with Vi. This editor is very useful for editing programs and other plain ASCII files. All commands are given with normal keyboard characters, so those who can type @@ -56,15 +56,16 @@ distribute it. SPONSORING -Fixing bugs and adding new features takes a lot of effort. For a few years -Bram has attempted to do this next to a full-time job. During that time the -todo list kept getting longer and longer. +Fixing bugs and adding new features takes a lot of time and effort. To show +your appreciation for the work and motivate Bram and others to continue +working on Vim please send a donation. -In order for Bram to support Vim properly he needs your help. Through your -donations Bram will be able to have a part-time job and spend more time on -fixing bugs and adding new features. +Since Bram is back to a paid job the money will now be used to help children +in Uganda. See runtime/doc/uganda.txt. But at the same time donations +increase Bram's motivation to keep working on Vim! For the most recent information about sponsoring look on the Vim web site: + http://www.vim.org/sponsor/ @@ -132,6 +133,9 @@ MAIN AUTHOR Send any other comments, patches, pizza and suggestions to: Bram Moolenaar E-mail: Bram@vim.org - Clematisstraat 30 - 5925 BE Venlo Tel: +31 77 387 2340 - The Netherlands Fax/voice-mail: +31 20 773 8272 + Molenstraat 2 + 2161 HP Lisse + The Netherlands + +This is the address of my parents, they will forward mail and eat the pizza. +My actual address will change a couple of times in 2006. diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim index 6790f4ff4e..c71a4dc3d3 100644 --- a/runtime/autoload/zip.vim +++ b/runtime/autoload/zip.vim @@ -1,7 +1,7 @@ " zip.vim: Handles browsing zipfiles " AUTOLOAD PORTION -" Date: Mar 22, 2006 -" Version: 7 +" Date: Apr 10, 2006 +" Version: 8 " Maintainer: Charles E Campbell, Jr <drchipNOSPAM at campbellfamily dot biz> " License: Vim License (see vim's :help license) " Copyright: Copyright (C) 2005 Charles E. Campbell, Jr. {{{1 @@ -22,7 +22,7 @@ if exists("g:loaded_zip") finish endif -let g:loaded_zip = "v7" +let g:loaded_zip = "v8" let s:zipfile_escape = ' ?&;\' " ---------------- @@ -83,7 +83,9 @@ fun! zip#Browse(zipfile) 4,$g/^\s*----/d 4,$g/^\s*\a/d $d - exe 'silent 4,$s/^.*\%'.namecol.'c//' + if namecol > 0 + exe 'silent 4,$s/^.*\%'.namecol.'c//' + endif setlocal noma nomod ro noremap <silent> <buffer> <cr> :call <SID>ZipBrowseSelect()<cr> diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt index e8e1caa6a1..4aebe30c8b 100644 --- a/runtime/doc/change.txt +++ b/runtime/doc/change.txt @@ -1,4 +1,4 @@ -*change.txt* For Vim version 7.0d. Last change: 2006 Apr 09 +*change.txt* For Vim version 7.0d. Last change: 2006 Apr 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1508,7 +1508,7 @@ Vim has a sorting function and a sorting command. The sorting function can be found here: |sort()|. *:sor* *:sort* -:[range]sor[t][!] [i][u][n][x][o] [/{pattern}/] +:[range]sor[t][!] [i][u][r][n][x][o] [/{pattern}/] Sort lines in [range]. When no range is given all lines are sorted. @@ -1517,24 +1517,25 @@ found here: |sort()|. With [i] case is ignored. With [n] sorting is done on the first decimal number - in the line (after a {pattern} match). + in the line (after or inside a {pattern} match). With [x] sorting is done on the first hexadecimal - number in the line (after a {pattern} match). A - leading "0x" or "0X" is ignored. + number in the line (after or inside a {pattern} + match). A leading "0x" or "0X" is ignored. With [o] sorting is done on the first octal number in - the line (after a {pattern} match). + the line (after or inside a {pattern} match). With [u] only keep the first of a sequence of identical lines (ignoring case when [i] is used). + Without this flag, a sequence of identical lines + will be kept in their original order. Note that leading and trailing white space may cause lines to be different. - When /{pattern}/ is specified the text matched with - {pattern} is skipped, so that you sort on what comes - after the match. For lines without a match sorting - starts in the first column (e.g., for empty lines). + When /{pattern}/ is specified and there is no [r] flag + the text matched with {pattern} is skipped, so that + you sort on what comes after the match. Instead of the slash any non-letter can be used. For example, to sort on the second comma-separated field: > @@ -1545,7 +1546,21 @@ found here: |sort()|. < To sort on the first number in the line, no matter what is in front of it: > :sort /.*\ze\d/ -< + +< With [r] sorting is done on the matching {pattern} + instead of skipping past it as described above. + For example, to sort on only the first three letters + of each line: > + :sort /\a\a\a/ r + +< If a {pattern} is used, any lines which don't have a + match for {pattern} are kept in their current order, + but separate from the lines which do match {pattern}. + If you sorted in reverse, they will be in reverse + order after the sorted lines, otherwise they will be + in their original order, right before the sorted + lines. + Note that using ":sort" with ":global" doesn't sort the matching lines, it's quite useless. @@ -1553,8 +1568,8 @@ The details about sorting depend on the library function used. There is no guarantee that sorting is "stable" or obeys the current locale. You will have to try it out. -The sorting itself cannot be interrupted, because of using a system library -function. You can interrupt the preparation (for undo) and putting the sorted -lines into the buffer. In the last case you may end up with duplicated lines. +The sorting can be interrupted, but if you interrupt it too late in the +process you may end up with duplicated lines. This also depends on the system +library function used. vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt index 491f4cab6a..848ce0ba79 100644 --- a/runtime/doc/index.txt +++ b/runtime/doc/index.txt @@ -1,4 +1,4 @@ -*index.txt* For Vim version 7.0d. Last change: 2006 Apr 06 +*index.txt* For Vim version 7.0d. Last change: 2006 Apr 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -529,6 +529,7 @@ tag command action in Normal mode ~ |CTRL-W_P| CTRL-W P go to preview window |CTRL-W_R| CTRL-W R rotate windows upwards N times |CTRL-W_S| CTRL-W S same as "CTRL-W s" +|CTRL-W_T| CTRL-W T move current window to a new tab page |CTRL-W_W| CTRL-W W go to N previous window (wrap around) |CTRL-W_]| CTRL-W ] split window and jump to tag under cursor |CTRL-W_^| CTRL-W ^ split current window and edit alternate diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt index 412771de51..ae47469f21 100644 --- a/runtime/doc/insert.txt +++ b/runtime/doc/insert.txt @@ -1,4 +1,4 @@ -*insert.txt* For Vim version 7.0d. Last change: 2006 Apr 10 +*insert.txt* For Vim version 7.0d. Last change: 2006 Apr 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -1419,8 +1419,8 @@ Features are: a tag) - when attribute has limited number of possible values help to complete them -- complete names of entities (defined in |xml-omni-datafile| and in current file - with "<!ENTITY" declarations +- complete names of entities (defined in |xml-omni-datafile| and in current + file with "<!ENTITY" declarations - when used after "</" CTRL-X CTRL-O will close the last opened tag Format of XML data file *xml-omni-datafile* diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt index 1ee0e40d5a..49e1faa806 100644 --- a/runtime/doc/map.txt +++ b/runtime/doc/map.txt @@ -1,4 +1,4 @@ -*map.txt* For Vim version 7.0d. Last change: 2006 Mar 20 +*map.txt* For Vim version 7.0d. Last change: 2006 Apr 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -265,6 +265,7 @@ Overview of which map command works in which mode: :vmap :vnoremap :vunmap :vmapclear - yes - :omap :onoremap :ounmap :omapclear - - yes +:nunmap can also be used outside of a monastery. *mapmode-x* *mapmode-s* Some commands work both in Visual and Select mode, some in only one. Note that quite often "Visual" is mentioned where both Visual and Select mode diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt index 129c43eadf..790cccf8ff 100644 --- a/runtime/doc/message.txt +++ b/runtime/doc/message.txt @@ -1,4 +1,4 @@ -*message.txt* For Vim version 7.0d. Last change: 2006 Mar 01 +*message.txt* For Vim version 7.0d. Last change: 2006 Apr 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -413,7 +413,10 @@ device and it isn't present. You can ignore this error. You have used an ":unmap" command with an argument which is not an existing mapping. All variations of this command give the same message: ":cunmap", -":unmap!", etc. Check for trailing white space. +":unmap!", etc. A few hints: +- Check for trailing white space. +- If the mapping is buffer-local you need to use ":unmap <buffer>". + |:map-<buffer>| *E37* *E89* > No write since last change (use ! to override) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 7718a584ed..deaf590ae4 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.0d. Last change: 2006 Apr 10 +*options.txt* For Vim version 7.0d. Last change: 2006 Apr 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2068,6 +2068,11 @@ A jump table for the options with a short description can be found at |Q_op|. Highlight the screen column of the cursor with CursorColumn |hl-CursorColumn|. Useful to align text. Will make screen redrawing slower. + If you only want the highlighting in the current window you can use + these autocommands: > + au WinLeave * set nocursorline nocursorcolumn + au WinEnter * set cursorline cursorcolumn +< *'cursorline'* *'cul'* *'nocursorline'* *'nocul'* 'cursorline' 'cul' boolean (default off) diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt index eca77df2bf..fa4f3b071f 100644 --- a/runtime/doc/pi_zip.txt +++ b/runtime/doc/pi_zip.txt @@ -1,4 +1,4 @@ -*zip.txt* For Vim version 7.0d. Last change: 2006 Apr 03 +*zip.txt* For Vim version 7.0d. Last change: 2006 Apr 10 +====================+ | Zip File Interface | @@ -33,6 +33,11 @@ Copyright: Copyright (C) 2005,2006 Charles E Campbell, Jr {{{1 *zip-copyright* ============================================================================== 3. History *zip-history* + v8 Apr 10, 2006 * Bram Moolenaar reported that he received an error message + due to "Pattern not found: ^.*\%0c"; this was caused by + stridx finding a Name... at the beginning of the line; + zip.vim tried 4,$s/^.*\%0c//, but that doesn't work. + Fixed. v7 Mar 22, 2006 * escaped some characters that can cause filename handling problems. v6 Dec 21, 2005 * writing to files not in directories caused problems - diff --git a/runtime/doc/tags b/runtime/doc/tags index 4134a1da1d..7fa442d5aa 100644 --- a/runtime/doc/tags +++ b/runtime/doc/tags @@ -3188,6 +3188,7 @@ CTRL-W_L windows.txt /*CTRL-W_L* CTRL-W_P windows.txt /*CTRL-W_P* CTRL-W_R windows.txt /*CTRL-W_R* CTRL-W_S windows.txt /*CTRL-W_S* +CTRL-W_T windows.txt /*CTRL-W_T* CTRL-W_W windows.txt /*CTRL-W_W* CTRL-W_] windows.txt /*CTRL-W_]* CTRL-W_^ windows.txt /*CTRL-W_^* diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 979988fec6..6ca47b61f7 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0d. Last change: 2006 Apr 10 +*todo.txt* For Vim version 7.0d. Last change: 2006 Apr 11 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 ----------------------- +Include autoload/xml/*.vim files? Need to adjust install scripts then. + ":mkspell" still takes much too long in Hungarian dictionary. +- Are all prefixes really postponed now? +- postpone secondary suffixes? Handle postponed prefix with COMPOUNDPERMITFLAG or COMPOUNDFORBIDFLAG. WFP_COMPPERMIT and WFP_COMPFORBID @@ -47,8 +51,14 @@ New Hungarian dictionary. (Laci Nemeth) How is it supposed to work? - implement using CHECKCOMPOUNDPATTERN: match words with sl_comppat[]. +Update vi_diff.txt for Vim 7 features. + +8 tab pages in the session file, if "tabpages" in 'sessionoptions' + Add more tests for all new functionality in Vim 7. Especially new functions. +Do some of the 'cindent' bugs below. + Win32: Describe how to do debugging. (George Reilly) Mac unicode patch (Da Woon Jung, Eckehard Berns): @@ -1092,7 +1102,6 @@ User Friendlier: Tab pages: 9 GUI implementation for the tab pages line for other systems. 8 Make GUI menu in tab pages line configurable. Like the popup menu. -8 tab pages in the session file, if "tabpages" in 'sessionoptions' 8 :tabmove +N move tab page N pages forward 8 :tabmove -N move tab page N pages backward 7 :tabdup duplicate the tab with all its windows. diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index a0758a69e6..4afaaeb49a 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0d. Last change: 2006 Apr 10 +*version7.txt* For Vim version 7.0d. Last change: 2006 Apr 11 VIM REFERENCE MANUAL by Bram Moolenaar @@ -628,7 +628,7 @@ Win32: The ":winpos" command now also works in the console. (Vipin Aravind) |:viusage| Help for Vi commands (Nvi command). |:sort| Sort lines in the buffer without depending on an - external command. + external command. (partly by Bryce Wagner) |:caddfile| Add error messages to an existing quickfix list (Yegappan Lakshmanan). @@ -913,6 +913,7 @@ Haskell ftplugin file. (Nikolai Weibull) help ftplugin file. (Nikolai Weibull) indent ftplugin file. (Nikolai Weibull) Javascript ftplugin file. (Bram Moolenaar) +Kconfig ftplugin and syntax file. (Nikolai Weibull) ld syntax, indent and ftplugin file. (Nikolai Weibull) lftp ftplugin file. (Nikolai Weibull) libao config ftplugin file. (Nikolai Weibull) @@ -2420,4 +2421,26 @@ Now use Enter to select the match after using a cursor key. Added "usetab" to 'switchbuf'. + +--- fixes and changes since Vim 7.0d --- + +Added CTRL-W T: move a window to a new tab page. + +Using CTRL-X s in Insert mode to complete spelling suggestions and using BS +deleted characters before the bad word. + +A few small fixes for the VMS makefile. (Zoltan Arpadffy) + +With a window of 91 lines 45 cols, ":vsp" scrolled the window. Copy w_wrow +when splitting a window and skip setting the height when it's already at the +right value. + +Using <silent> in a mapping with a shell command and the GUI caused redraw +to use wrong attributes. + +Win32: Using MSVC 4.1 for install.exe resulted in the start menu items to be +created in the administrator directory instead of "All Users". Define the +CSIDL_ items if they are missing. + + vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/doc/vim-fr.1 b/runtime/doc/vim-fr.1 index 956c1208fa..820985715d 100644 --- a/runtime/doc/vim-fr.1 +++ b/runtime/doc/vim-fr.1 @@ -1,7 +1,7 @@ .\" Traduction Lundi 7 août 2000 par Richard Hitier .\" (richard.hitier@dial.oleane.com) .\" Mise à jour de la traduction par David Blanchet -.\" (david.blanchet@free.fr) 2005-01-17 +.\" (david.blanchet@free.fr) 2006-06-10 .\" .TH VIM 1 "22 Février 2002" .SH NOM @@ -325,6 +325,10 @@ Quand N est omis, ouvre une fenêtre pour chaque fichier. Ouvre N fenêtres côte à côte. Quand N est omis, ouvre une fenêtre pour chaque fichier fichier. .TP +\-p[N] +Ouvre N onglets. +Quand N est omis, ouvre un onglet pour chaque fichier fichier. +.TP \-R Mode Lecture-Seule. Active l'option 'readonly'. @@ -579,4 +583,4 @@ Cette page de manuel a été traduite par Richard Hitier. <richard.hitier@dial.oleane.com> 2000-08-07. .br Cette page de manuel a été mise à jour par David Blanchet. -<david.blanchet@free.fr> 2005-01-17. +<david.blanchet@free.fr> 2006-04-10. diff --git a/runtime/doc/vim-fr.UTF-8.1 b/runtime/doc/vim-fr.UTF-8.1 index d9b7cf4380..a21ad06659 100644 --- a/runtime/doc/vim-fr.UTF-8.1 +++ b/runtime/doc/vim-fr.UTF-8.1 @@ -1,7 +1,7 @@ .\" Traduction Lundi 7 août 2000 par Richard Hitier .\" (richard.hitier@dial.oleane.com) .\" Mise à jour de la traduction par David Blanchet -.\" (david.blanchet@free.fr) 2005-01-17 +.\" (david.blanchet@free.fr) 2006-06-10 .\" .TH VIM 1 "22 Février 2002" .SH NOM @@ -325,6 +325,10 @@ Quand N est omis, ouvre une fenêtre pour chaque fichier. Ouvre N fenêtres côte à côte. Quand N est omis, ouvre une fenêtre pour chaque fichier fichier. .TP +\-p[N] +Ouvre N onglets. +Quand N est omis, ouvre un onglet pour chaque fichier fichier. +.TP \-R Mode Lecture-Seule. Active l'option 'readonly'. @@ -579,4 +583,4 @@ Cette page de manuel a été traduite par Richard Hitier. <richard.hitier@dial.oleane.com> 2000-08-07. .br Cette page de manuel a été mise à jour par David Blanchet. -<david.blanchet@free.fr> 2005-01-17. +<david.blanchet@free.fr> 2006-04-10. diff --git a/runtime/doc/vim.1 b/runtime/doc/vim.1 index cdf71ac3bd..4e90da2760 100644 --- a/runtime/doc/vim.1 +++ b/runtime/doc/vim.1 @@ -1,4 +1,4 @@ -.TH VIM 1 "2002 Feb 22" +.TH VIM 1 "2006 Apr 11" .SH NAME vim \- Vi IMproved, a programmers text editor .SH SYNOPSIS diff --git a/runtime/doc/vim.man b/runtime/doc/vim.man index 9b70e7f96f..fa5c5c855f 100644 --- a/runtime/doc/vim.man +++ b/runtime/doc/vim.man @@ -425,4 +425,4 @@ BUGS - 2002 Feb 22 VIM(1) + 2006 Apr 11 VIM(1) diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt index c4aeb87d50..499b6caf44 100644 --- a/runtime/doc/windows.txt +++ b/runtime/doc/windows.txt @@ -1,4 +1,4 @@ -*windows.txt* For Vim version 7.0d. Last change: 2006 Apr 06 +*windows.txt* For Vim version 7.0d. Last change: 2006 Apr 10 VIM REFERENCE MANUAL by Bram Moolenaar @@ -434,6 +434,13 @@ CTRL-W L Move the current window to be at the far right, using the full contents is used for the new window. {not available when compiled without the +vertsplit feature} + *CTRL-W_T* +CTRL-W T Move the current window to a new tab page. This fails if + there is only one window in the current tab page. + When a count is specified the new tab page will be opened + before the tab page with this index. Otherwise it comes after + the current tab page. + ============================================================================== 6. Window resizing *window-resize* diff --git a/runtime/filetype.vim b/runtime/filetype.vim index 8d1f155eb3..3aa1ee79ce 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: 2006 Apr 04 +" Last Change: 2006 Apr 11 " Listen very carefully, I will say this only once if exists("did_load_filetypes") @@ -784,6 +784,9 @@ au BufNewFile,BufRead *.k setf kwt " KDE script au BufNewFile,BufRead *.ks setf kscript +" Kconfig +au BufNewFile,BufRead Kconfig,Kconfig.debug setf kconfig + " Lace (ISE) au BufNewFile,BufRead *.ace,*.ACE setf lace @@ -1662,13 +1665,25 @@ au BufNewFile,BufRead /etc/sysctl.conf setf sysctl " Sudoers au BufNewFile,BufRead /etc/sudoers,sudoers.tmp setf sudoers +" If the file has an extension of 't' and is in a directory 't' then it is +" almost certainly a Perl test file. " If the first line starts with '#' and contains 'perl' it's probably a Perl " file. +" (Slow test) If a file contains a 'use' statement then it is almost certainly +" a Perl file. fun! s:FTperl() + if expand("%:e") == 't' && expand("%:p:h:t") == 't' + setf perl + return 1 + endif if getline(1)[0] == '#' && getline(1) =~ 'perl' setf perl return 1 endif + if search('^use\s\s*\k', 'nc', 30) + setf perl + return 1 + endif return 0 endfun @@ -1961,7 +1976,7 @@ au BufNewFile,BufRead *.yaml,*.yml setf yaml " Zope " dtml (zope dynamic template markup language), pt (zope page template), " cpt (zope form controller page template) -au BufNewFile,BufRead *.dtml,*.pt,*.cpt call <SID>FTCheck_html() +au BufNewFile,BufRead *.dtml,*.pt,*.cpt call s:FThtml() " zsql (zope sql method) au BufNewFile,BufRead *.zsql call s:SQL() diff --git a/runtime/ftplugin/kconfig.vim b/runtime/ftplugin/kconfig.vim new file mode 100644 index 0000000000..ca1a56b8eb --- /dev/null +++ b/runtime/ftplugin/kconfig.vim @@ -0,0 +1,14 @@ +" Vim filetype plugin file +" Maintainer: Nikolai Weibull <now@bitwi.se> +" Latest Revision: 2006-04-10 + +if exists("b:did_ftplugin") + finish +endif +let b:did_ftplugin = 1 + +let b:undo_ftplugin = "setl com< cms< fo<" + +setlocal comments=:# commentstring=#\ %s formatoptions-=t formatoptions+=croql + + diff --git a/runtime/ftplugin/ocaml.vim b/runtime/ftplugin/ocaml.vim index 6f2b17cb7e..0b9819a9b6 100644 --- a/runtime/ftplugin/ocaml.vim +++ b/runtime/ftplugin/ocaml.vim @@ -4,11 +4,12 @@ " Markus Mottl <markus.mottl@gmail.com> " Stefano Zacchiroli <zack@bononia.it> " URL: http://www.ocaml.info/vim/ftplugin/ocaml.vim -" Last Change: 2006 Feb 05 +" Last Change: 2006 Apr 11 - Fixed an initialization bug; fixed ASS abbrev (MM) +" 2005 Oct 13 - removed GPL; better matchit support (MM, SZ) " -" if exists("b:did_ftplugin") -" finish -" endif +if exists("b:did_ftplugin") + finish +endif let b:did_ftplugin=1 " Error handling -- helps moving where the compiler wants you to go @@ -44,7 +45,7 @@ if !exists("no_plugin_maps") && !exists("no_ocaml_maps") vnoremap <buffer> <Plug>BUncomOff <ESC>:'<,'><CR>`<dd`>dd`< if !hasmapto('<Plug>Abbrev') - iabbrev <buffer> ASS (assert false (* XXX *)) + iabbrev <buffer> ASS (assert (0=1) (* XXX *)) endif endif diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim index d78da193b8..6c2d49942f 100644 --- a/runtime/indent/html.vim +++ b/runtime/indent/html.vim @@ -1,8 +1,8 @@ " Description: html indenter " Author: Johannes Zellner <johannes@zellner.org> " Last Change: Tue, 27 Apr 2004 10:28:39 CEST -" Globals: g:html_indent_tags -- indenting tags -" g:html_indent_strict -- inhibit 'O O' elements +" Globals: g:html_indent_tags -- indenting tags +" g:html_indent_strict -- inhibit 'O O' elements " g:html_indent_strict_table -- inhibit 'O -' elements " Only load this indent file when no other was loaded. @@ -14,7 +14,7 @@ let b:did_indent = 1 " [-- local settings (must come before aborting the script) --] setlocal indentexpr=HtmlIndentGet(v:lnum) -setlocal indentkeys=o,O,*<Return>,<>>,<bs>,{,} +setlocal indentkeys=o,O,*<Return>,<>>,{,} if exists('g:html_indent_tags') diff --git a/runtime/makemenu.vim b/runtime/makemenu.vim index 02905c95e3..9194e9f0ff 100644 --- a/runtime/makemenu.vim +++ b/runtime/makemenu.vim @@ -1,6 +1,6 @@ " Script to define the syntax menu in synmenu.vim " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2006 Apr 10 +" Last Change: 2006 Apr 11 " This is used by "make menu" in the src directory. edit <sfile>:p:h/synmenu.vim @@ -237,6 +237,7 @@ SynMenu HIJK.Java.Java\ Properties:jproperties SynMenu HIJK.JavaScript:javascript SynMenu HIJK.Jess:jess SynMenu HIJK.Jgraph:jgraph +SynMenu HIJK.Kconfig:kconfig SynMenu HIJK.KDE\ script:kscript SynMenu HIJK.Kimwitu++:kwt SynMenu HIJK.KixTart:kix diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim index e7aec09479..1bda521002 100644 --- a/runtime/synmenu.vim +++ b/runtime/synmenu.vim @@ -213,9 +213,10 @@ an 50.50.440 &Syntax.HIJK.Java.Java\ Properties :cal SetSyn("jproperties")<CR> an 50.50.450 &Syntax.HIJK.JavaScript :cal SetSyn("javascript")<CR> an 50.50.460 &Syntax.HIJK.Jess :cal SetSyn("jess")<CR> an 50.50.470 &Syntax.HIJK.Jgraph :cal SetSyn("jgraph")<CR> -an 50.50.490 &Syntax.HIJK.KDE\ script :cal SetSyn("kscript")<CR> |