Mercurial > vim
changeset 2587:d0049ff5969e
Updated runtime files.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Tue, 21 Sep 2010 22:34:02 +0200 |
| parents | 538cd3220874 |
| children | 5df74a812b7b |
| files | runtime/doc/options.txt runtime/doc/todo.txt runtime/indent/dtd.vim runtime/syntax/po.vim runtime/syntax/python.vim |
| diffstat | 5 files changed, 33 insertions(+), 79 deletions(-) [+] |
line wrap: on
line diff
--- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1,4 +1,4 @@ -*options.txt* For Vim version 7.3. Last change: 2010 Aug 15 +*options.txt* For Vim version 7.3. Last change: 2010 Sep 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -2817,13 +2817,13 @@ A jump table for the options with a shor 2. If a <NL> is found and 'fileformats' includes "unix", 'fileformat' is set to "unix". Note that when a <NL> is found without a preceding <CR>, "unix" is preferred over "dos". - 3. If 'fileformats' includes "mac", 'fileformat' is set to "mac". - This means that "mac" is only chosen when "unix" is not present, - or when no <NL> is found in the file, and when "dos" is not - present, or no <CR><NL> is present in the file. - Also if "unix" was first chosen, but the first <CR> is before - the first <NL> and there appears to be more <CR>'s than <NL>'s in - the file, then 'fileformat' is set to "mac". + 3. If 'fileformat' has not yet been set, and if 'fileformats' + includes "mac", 'fileformat' is set to "mac". + This means that "mac" is only chosen when: + "unix" is not present or no <NL> is found in the file, and + "dos" is not present or no <CR><NL> is found in the file. + Except: if "unix" was chosen, but there is a <CR> before + the first <NL>, and there appear to be more <CR>s than <NL>s in 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
--- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.3. Last change: 2010 Sep 19 +*todo.txt* For Vim version 7.3. Last change: 2010 Sep 21 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,28 +30,16 @@ be worked on, but only if you sponsor Vi *known-bugs* -------------------- Known bugs and current work ----------------------- -"buffer" in if_python.c, ex_pyfile() shadows global var buffer in if_py_both.h - -Crash on Windows when using strftime(). (Christian Brabandt, 2010 Aug 18) -Appears to be triggered by '%R' and '%T'. -Use the bad_param_handler() (Mike Williams, 2010 Aug 19, 20) - -Patch: missing break in Mac GUI. (Dominique Pelle, 2010 Aug 19) - -":e ~br<Tab>" does not complete to ":e /home/bram/". Crash too? - Patch for Mingw build file (Jon, 2010 Aug 22) Patch for loading different Ruby versions. (Jon, 2010 Aug 23) -Patch for clipboard not working properly: (Toni Ronkko) -http://softagalleria.net/download/vim/clipboard.patch -Clipboard not working with Athena. (Micael Ringe, 2010 Sep 13) - Document cscope and sign completion for user commands. (Peter Odding, 2010 Aug 19) Problem with \NL in Ex script. (Ray Frish, 2010 Aug 10) +":e ~br<Tab>" does not complete to ":e /home/bram/". Crash too? + Runtime file for Falcon. (Steven Oliver, 2010 Sep 14) Patch to fix error tags in help files. (Dominique Pelle, 2010 Aug 25) @@ -106,7 +94,7 @@ 2010 Aug 8) Three patches for undo persistence. (Christian Brabandt, 2010 Sep 4) string() can't parse back "inf" and "nan". Fix documentation or fix code? -(XyX, 2010 Aug 23) +(ZyX, 2010 Aug 23) ":command Print echo 'print'" works, but ":Print" doesn't. Builtin Print should be overruled. (Aaron Thoma) @@ -1573,7 +1561,7 @@ 5 When starting gvim with all the defa Motif GUI: -- gui_mch_browsedir() is missing. +- gui_mch_browsedir() is missing, browsedir() doesn't work nicely. 7 Use XmStringCreateLocalized() instead of XmStringCreateSimple()? David Harrison says it's OK (it exists in Motif 1.2). 8 Lesstif: When deleting a menu that's torn off, the torn off menu becomes @@ -1783,33 +1771,17 @@ 8 Executing a shell, only one option f Macintosh: - GUI: gui_mch_browsedir() is missing. -7 Patch to add 'transparency' option. Disadvantage: it's slow. (Eckehard - Berns, 2004 May 9) http://ecki.to/vim/TransBack-2004-05-09.diff - Needs more work. Add when someone really wants it. 7 Loading the Perl library only works on OS/X 10.2 or 10.3, never on both. Load the Perl library dynamically see Python sources file dynload_mac (Jack) dynamic linking: http://developer.apple.com/technotes/tn2002/tn2064.html -8 Inputting Unicode characters does not work in the terminal. They appear - to arrive as upper and lower bytes. (David Brown, 2004 April 17) -8 Typing Unicode characters doesn't work at all in the GUI. 8 inputdialog() doesn't resize when giving more text lines. (David Fishburn, 2006 Sept 28) -9 Problems in Carbon version for OS X: (Benji Fisher) - - keyboard shortcuts in the menus get lost. -8 The Vim/About menu doesn't work. -8 ":gui" doesn't fork. Enabling the code in gui.c to fork causes a SEGV. 8 Define vim_mkdir() for Macintosh. 8 Define mch_writable() for Macintosh. 9 When DiskLock is running, using a swap file causes a crash. Appears to be a problem with writing a file that starts with a dot. (Giacalone) -9 On G3 Mac, OS version 8, control strip causes characters messed up when - scrolling (CTRL-L cleans it up). (Benji Fisher) -9 On G3 Mac, OS version 8, variable-speed scrolling doesn't work, after two - seconds of scrolling the screen freezes. (Benji Fisher) 9 In mac_expandpath() check that handling of backslashes is done properly. -8 Standard Mac shortcuts are missing. (Amerige) -8 Handling of non-fixed width fonts is wrong. (Amerige) "Small" problems: @@ -2705,9 +2677,6 @@ 7 Add "semitrans": Add highlighting. colors. And add colors, so that Green+Red becomes Yellow. E.g. for this html: <B> bold text <I> italic+bold text </B> italic text </I> -7 Wild idea: Not only set highlighting, but also change what is displayed - (e.g., remove characters, so that "<B>bold</B>" can be shown as "bold"): - :syn region boldstuff start="<B>" display="" end="</B>" display="" 7 CTRL-] checks the highlight group for finding out what the tag is. 7 Add an explanation how a list of words can be used to highlight misspelled words. @@ -2881,8 +2850,6 @@ 7 Make it possible to do any command o "command" would use <> notation. Does scratch buffer have a number? Or re-use same number? 7 Add function to generate unique number (date in milliseconds). -7 Automatically load a function from a file when it is called. Need an - option for the search path. (Sekera) Robustness: @@ -2934,7 +2901,7 @@ 7 HTML syntax highlighting is slow for http://www.theregister.co.uk/content/4/22908.html. (Andre Pang) 7 Check how performance of loading the wordlist can be improved (adding a lot of abbreviations). -7 DOS console: Add t_DL support, to make scrolling faster. +7 MS-DOS console: Add t_DL support, to make scrolling faster. 7 Compile Ex commands to byte codes. Store byte codes in a vim script file at the end, after "compiled:. Make it look like a single comment line for old Vim versions. Insert first line "Vim script compiled <timestamp>. @@ -3067,7 +3034,7 @@ 7 Make 'list' and 'linebreak' work tog Scrolling: -8 Add "zm" command: scroll horizontally to put the cursor in the middle. +8 Add "zy" command: scroll horizontally to put the cursor in the middle. 6 Add option to set the overlap for CTRL-F and CTRL-B. (Garhi) - extend 'scrollbind' option: 'scrollopt' words "search", "relative", etc.. Also 'e'xecute some commands (search, vertical movements) in all bound @@ -3303,8 +3270,6 @@ 7 For autocommand events that trigger CursorHold), go through the list once and cache the result for a specific buffer. Invalidate the cache when adding/deleting autocommands or changing the buffer name. -8 Add ScriptReadCmd event: used to load remote Vim scripts, e.g. - "vim -u http://mach/path/vimrc". 7 Add TagJump event: do something after jumping to a tag. 8 Add "TagJumpFile" autocommand: When jumping to another file for a tag. Can be used to open "main.c.gz" when "main.c" isn't found. @@ -3355,8 +3320,6 @@ 8 When editing "tt.gz", which is in DO PreDirChanged/PostDirChanged - Before/after ":cd" has been used (for changing the window title) - BufReadAction - replaces reading a file - BufWriteAction - replaces writing a file ShutDown - when the system is about to shut down InsertCharPre - user typed character Insert mode, before inserting the char. Pattern is matched with text before the cursor. @@ -3833,21 +3796,14 @@ 8 Add ":cab!", abbreviations that only 8 Add a flag to ":abbrev" to eat the character that triggers the abbreviation. Thus "abb ab xxx" and typing "ab<Space>" inserts "xxx" and not the <Space>. -8 Allow mapping of CTRL-@ (anywhere in the LHS). 8 Give a warning when using CTRL-C in the lhs of a mapping. It will never (?) work. 8 Add a way to save a current mapping and restore it later. Use a function that returns the mapping command to restore it: mapcmd()? mapcheck() is not fool proof. How to handle ambiguous mappings? 7 Add <0x8f> (hex), <033> (octal) and <123> (decimal) to <> notation? -7 Allow mapping "Q" and "Q}" at the same time. Need to put a flag with "Q", - that it needs an extra character before it can match. See Vile 'maplonger' - option. 7 When someone tries to unmap with a trailing space, and it fails, try unmapping without the trailing space. Helps for ":unmap xx | unmap yy". -7 Make it possible to map 'wildchar', but only when it's a special character - (like CTRL-E). Currently it's only recognized when typed. Useful for - mapping a key to do something and then completion. 6 Context-sensitive abbreviations: Specify syntax group(s) in which the abbreviations are to be used. - Add mappings that take arguments. Could work like the ":s" command. For @@ -3859,12 +3815,9 @@ 6 Context-sensitive abbreviations: Spe :map q<Char> :s/<Char>/\u\0/g Or implicit: :map q <Register>d<Number>$ -- Make it possible to include a <Nul> in the lhs and rhs of a mapping. - Add command to repeat a whole mapping ("." only repeats the last change in a mapping). Also: Repeat a whole insert command, including any mappings that it included. Sort-of automatic recording? -- Add an option to ":map" that makes it display the special keys in - <> notation (e.g. <CR> instead of ^M). Or just always do this? - Include an option (or flag to 'cpoptions') that makes errors in mappings not flush the rest of the mapping (like nvi does). - Use context sensitiveness of completion to switch abbreviations and @@ -4514,7 +4467,7 @@ 7 Add a way to change an operator to a (like "v" makes the operator characterwise-exclusive). "x" could be used. - Make a set of operations on list of names: expand wildcards, replace home dir, append a string, delete a string, etc. -- Remove mktemp() and use tmpname() only? Ctags does this. +- Remove using mktemp() and use tmpname() only? Ctags does this. - When replacing environment variables, and there is one that is not set, turn it into an empty string? Only when expanding options? (Hiebert) - Option to set command to be executed instead of producing a beep (e.g. to @@ -4599,7 +4552,6 @@ 6 Add ":che <file>", list all the incl expanded. Is there a better way to do this? - Add ":@!" command, to ":@" like what ":source!" is to ":source". 8 Add ":@:!": repeat last command with forceit set. -- Should be possible to write to a device, e.g. ":w! /dev/null". - Add 't_normal': Used whenever t_me, t_se, t_ue or t_Zr is empty. - ":cab map test ^V| je", ":cunab map" doesn't work. This is vi compatible! - CTRL-W CTRL-E and CTRL-W CTRL-Y should move the current window up or down @@ -4677,9 +4629,6 @@ 8 When using "gf" on an absolute file - ":split file1 file2" adds two more windows (Webb). - Don't give message "Incomplete last line" when editing binary file. - Add ":a", ":i" for preloading of named buffers. -- Allow autowrite when doing ":e file" (with an option 'eaw'). -- Allow a "+command" argument before each file name in the Vim command line: - "vim +123 file1 +234 file2 +345 file3". ??? - When entering text, keep other windows on same buffer updated (when a line entered)? - Check out how screen does output optimizing. Apparently this is possible @@ -4753,8 +4702,6 @@ 8 Allow opening an unnamed buffer with working in another window. Put cmdline in a separate window? - Add possibility to put output of Ex commands in a buffer or file, e.g. for ":set all". ":r :set all"? -- 'edit' option: When off changing the buffer is not possible (Really - read-only mode). - When the 'equalalways' option is set, creating a new window should not result in windows to become bigger. Deleting a window should not result in a window to become smaller (Webb).
--- a/runtime/indent/dtd.vim +++ b/runtime/indent/dtd.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: DTD (Document Type Definition for XML) " Maintainer: Nikolai Weibull <now@bitwi.se> -" Latest Revision: 2008-07-18 +" Latest Revision: 2010-09-21 let s:cpo_save = &cpo set cpo&vim @@ -52,7 +52,7 @@ function s:indent_to_innermost_parenthes let end = a:end let parentheses = [end - 1] while token != "" - let [token, end] = s:lex(a:line, end, '^\%([(),|]\|[A-Za-z0-9_-]\+\)[?*+]\=') + let [token, end] = s:lex(a:line, end, '^\%([(),|]\|[A-Za-z0-9_-]\+\|#PCDATA\|%[A-Za-z0-9_-]\+;\)[?*+]\=') if token[0] == '(' call add(parentheses, end - 1) elseif token[0] == ')' @@ -80,7 +80,7 @@ function GetDTDIndent() let lnum = line('.') let col = col('.') let indent = indent('.') - let line = join(getline(lnum, v:lnum - 1), "\n") + let line = lnum == v:lnum ? getline(lnum) : join(getline(lnum, v:lnum - 1), "\n") let [declaration, end] = s:lex1(line, col) if declaration == "" @@ -106,7 +106,7 @@ function GetDTDIndent() " Check for token following element name. This can be a specification of " whether the start or end tag may be omitted. If nothing is found, indent " one level. - let [token, end] = s:lex(line, end) + let [token, end] = s:lex(line, end, '^\%([-O(]\|ANY\|EMPTY\)') let n = 0 while token =~ '[-O]' && n < 2 let [token, end] = s:lex(line, end, '^\%([-O(]\|ANY\|EMPTY\)') @@ -214,8 +214,7 @@ function GetDTDIndent() " Finally look for the attribute’s default value. If non exists, indent " two levels. - " TODO: Do validation of keywords (#REQUIRED|#IMPLIED)? - let [default, end] = s:lex(line, end, '^\%("\_[^"]*"\|[^[:space:]]\+\)') + let [default, end] = s:lex(line, end, '^\%("\_[^"]*"\|#\(REQUIRED\|IMPLIED\|FIXED\)\)') if default == "" return indent + &sw * 2 elseif default == '#FIXED'
--- a/runtime/syntax/po.vim +++ b/runtime/syntax/po.vim @@ -1,10 +1,10 @@ " Vim syntax file " Language: po (gettext) " Maintainer: Dwayne Bailey <dwayne@translate.org.za> -" Last Change: 2008 Sep 17 +" Last Change: 2010 Sep 21 " Contributors: Dwayne Bailey (Most advanced syntax highlighting) " Leonardo Fontenelle (Spell checking) -" SungHyun Nam <goweol@gmail.com> (Original maintainer) +" Nam SungHyun <namsh@kldp.org> (Original maintainer) " For version 5.x: Clear all syntax items " For version 6.x: Quit when a syntax file was already loaded @@ -39,7 +39,7 @@ syn region poStringSTR start=+"+ skip=+\ \ contains=@Spell,poSpecial,poFormat,poHeaderItem,poCommentKDEError,poHeaderUndefined,poPluralKDEError,poMsguniqError,poKDEdesktopFile,poHtml,poAcceleratorStr,poHtmlNot,poVariable " Header and Copyright -syn match poHeaderItem "\(Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|MIME-Version\|Content-Type\|Content-Transfer-Encoding\|Plural-Forms\|X-Generator\): " contained +syn match poHeaderItem "\(Project-Id-Version\|Report-Msgid-Bugs-To\|POT-Creation-Date\|PO-Revision-Date\|Last-Translator\|Language-Team\|Language\|MIME-Version\|Content-Type\|Content-Transfer-Encoding\|Plural-Forms\|X-Generator\): " contained syn match poHeaderUndefined "\(PACKAGE VERSION\|YEAR-MO-DA HO:MI+ZONE\|FULL NAME <EMAIL@ADDRESS>\|LANGUAGE <LL@li.org>\|CHARSET\|ENCODING\|INTEGER\|EXPRESSION\)" contained syn match poCopyrightUnset "SOME DESCRIPTIVE TITLE\|FIRST AUTHOR <EMAIL@ADDRESS>, YEAR\|Copyright (C) YEAR Free Software Foundation, Inc\|YEAR THE PACKAGE\'S COPYRIGHT HOLDER\|PACKAGE" contained
--- a/runtime/syntax/python.vim +++ b/runtime/syntax/python.vim @@ -1,7 +1,7 @@ " Vim syntax file " Language: Python " Maintainer: Neil Schemenauer <nas@python.ca> -" Last Change: 2009-10-13 +" Last Change: 2010 Sep 21 " Credits: Zvezdan Petkovic <zpetkovic@acm.org> " Neil Schemenauer <nas@python.ca> " Dmitry Vasiliev @@ -45,6 +45,11 @@ elseif exists("b:current_syntax") finish endif +" We need nocompatible mode in order to continue lines with backslashes. +" Original setting will be restored. +let s:cpo_save = &cpo +set cpo&vim + " Keep Python keywords in alphabetical order inside groups for easy " comparison with the table in the 'Python Language Reference' " http://docs.python.org/reference/lexical_analysis.html#keywords. @@ -292,4 +297,7 @@ endif let b:current_syntax = "python" +let &cpo = s:cpo_save +unlet s:cpo_save + " vim:set sw=2 sts=2 ts=8 noet: