diff options
| -rw-r--r-- | runtime/doc/todo.txt | 10 | ||||
| -rw-r--r-- | runtime/doc/version7.txt | 15 | ||||
| -rw-r--r-- | runtime/ftplugin/bib.vim | 15 | ||||
| -rw-r--r-- | runtime/indent/changelog.vim | 15 | ||||
| -rw-r--r-- | runtime/indent/ishd.vim | 3 | ||||
| -rw-r--r-- | runtime/indent/java.vim | 6 | ||||
| -rw-r--r-- | src/eval.c | 17 |
7 files changed, 53 insertions, 28 deletions
diff --git a/runtime/doc/todo.txt b/runtime/doc/todo.txt index 3464c83db..b8f86b207 100644 --- a/runtime/doc/todo.txt +++ b/runtime/doc/todo.txt @@ -1,4 +1,4 @@ -*todo.txt* For Vim version 7.0aa. Last change: 2005 Mar 25 +*todo.txt* For Vim version 7.0aa. Last change: 2005 Mar 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -30,10 +30,6 @@ be worked on, but only if you sponsor Vim development. See |sponsor|. *known-bugs* -------------------- Known bugs and current work ----------------------- -Check that xterm function keys XHOME and ZHOME do work. - -Wildcard expansion failure: ":w /tmp/$$.`echo test`" (Adri Verhoef) - Mac unicode patch (Da Woon Jung): - selecting proportional font breaks display - UTF-8 text causes display problems. Font replacement causes this. @@ -50,6 +46,9 @@ autoload: For the "helpfile" item ":helptags" is run. Win32: Balloon text can't contain line break. + Hints for multiline tooltips from Alexei Alexandrov (2005 Mar 26) + Patch from Sergey Khorev, 2005 Mar 28 + Add has("balloon_multiline") Awaiting response: - Patch for mch_FullName() also in Vim 6.3? os_mswin.c @@ -106,6 +105,7 @@ PLANNED FOR VERSION 7.0: like commands. - "INTELLISENSE". First cleanup the Insert-mode completion. http://www.vim.org/scripts/script.php?script_id=747 + www.vim.org script 1213 (Java Development Environment) (Fuchuan Wang) http://sourceforge.net/projects/insenvim of http://insenvim.sourceforge.net http://cedet.sourceforge.net/intellisense.shtml (for Emacs) diff --git a/runtime/doc/version7.txt b/runtime/doc/version7.txt index 9657ca514..ec74a1040 100644 --- a/runtime/doc/version7.txt +++ b/runtime/doc/version7.txt @@ -1,4 +1,4 @@ -*version7.txt* For Vim version 7.0aa. Last change: 2005 Mar 24 +*version7.txt* For Vim version 7.0aa. Last change: 2005 Mar 28 VIM REFERENCE MANUAL by Bram Moolenaar @@ -323,7 +323,7 @@ New functions: ~ |count()| count nr of times a value is in a List or Dictionary |deepcopy()| make a full copy of a List or Dictionary |empty()| check if List or Dictionary is empty -|getqflist()| list of quickfix errors +|getqflist()| list of quickfix errors (Yegappan Lakshmanan) |extend()| append one List to another or add items from one Dictionary to another |filter()| remove selected items from a List or Dictionary @@ -351,7 +351,7 @@ New functions: ~ |remove()| remove one or more items from a List or Dictionary |repeat()| Repeat "expr" "count" times. (Christophe Poucet) |reverse()| reverse the order of a List -|setqflist()| create a quickfix list +|setqflist()| create a quickfix list (Yegappan Lakshmanan) |sort()| sort a List |split()| split a String into a List |string()| String representation of a List or Dictionary @@ -409,6 +409,10 @@ PHP compiler plugin. (Doug Kearns) Sive syntax file. (Nikolai Weibull) +Moved all the indent settings from the filetype plugin to the indent file. +Implemented b:undo_indent to undo indent settings when setting 'filetype' to a +different value. + New Keymaps: ~ @@ -607,6 +611,8 @@ modifiers. getwinvar() now also works to obtain a buffer-local option from the specified window. +Added the "%s" item to 'errorformat'. (Yegappan Lakshmanan) + ============================================================================== COMPILE TIME CHANGES *compile-changes-7* @@ -1017,4 +1023,7 @@ Don't insert a DBCS character with a NUL second byte. In Insert mode CTRL-O <Home> didn't move the cursor. Made "ins_at_eol" global and reset it in nv_home(). +Wildcard expansion failed: ":w /tmp/$$.`echo test`". Don't put quotes around +spaces inside backticks. + vim:tw=78:ts=8:ft=help:norl: diff --git a/runtime/ftplugin/bib.vim b/runtime/ftplugin/bib.vim deleted file mode 100644 index b4cd20fa5..000000000 --- a/runtime/ftplugin/bib.vim +++ /dev/null @@ -1,15 +0,0 @@ -" Vim filetype plugin -" Language: BibTeX -" Maintainer: Dorai Sitaram <ds26@gte.com> -" URL: http://www.ccs.neu.edu/~dorai/vimplugins/vimplugins.html -" Last Change: May 21, 2003 - -" Only do this when not done yet for this buffer -if exists("b:did_ftplugin") - finish -endif - -" Don't load another plugin for this buffer -let b:did_ftplugin = 1 - -setl cindent diff --git a/runtime/indent/changelog.vim b/runtime/indent/changelog.vim new file mode 100644 index 000000000..3aa8e0300 --- /dev/null +++ b/runtime/indent/changelog.vim @@ -0,0 +1,15 @@ +" Vim indent file +" Language: generic Changelog file +" Language: C +" Maintainer: noone +" Last Change: 2005 Mar 28 + +" Only load this indent file when no other was loaded. +if exists("b:did_indent") + finish +endif +let b:did_indent = 1 + +setlocal ai + +let b:undo_indent = "setl ai<" diff --git a/runtime/indent/ishd.vim b/runtime/indent/ishd.vim index 9b4d7ff0d..f55f7dc79 100644 --- a/runtime/indent/ishd.vim +++ b/runtime/indent/ishd.vim @@ -8,11 +8,14 @@ if exists("b:did_indent") endif let b:did_indent = 1 +setlocal autoindent setlocal indentexpr=GetIshdIndent(v:lnum) setlocal indentkeys& setlocal indentkeys+==else,=elseif,=endif,=end,=begin,<:> " setlocal indentkeys-=0# +let b:undo_indent = "setl ai< indentexpr< indentkeys<" + " Only define the function once. if exists("*GetIshdIndent") finish diff --git a/runtime/indent/java.vim b/runtime/indent/java.vim index 311d7086e..facbdbf57 100644 --- a/runtime/indent/java.vim +++ b/runtime/indent/java.vim @@ -1,7 +1,7 @@ " Vim indent file " Language: Java " Maintainer: Toby Allsopp <toby.allsopp@peace.com> (resigned) -" Last Change: 2004 Oct 05 +" Last Change: 2005 Mar 28 " Only load this indent file when no other was loaded. if exists("b:did_indent") @@ -10,7 +10,7 @@ endif let b:did_indent = 1 " Indent Java anonymous classes correctly. -setlocal cinoptions& cinoptions+=j1 +setlocal cindent cinoptions& cinoptions+=j1 " The "extends" and "implements" lines start off with the wrong indent. setlocal indentkeys& indentkeys+=0=extends indentkeys+=0=implements @@ -18,6 +18,8 @@ setlocal indentkeys& indentkeys+=0=extends indentkeys+=0=implements " Set the function to do the work. setlocal indentexpr=GetJavaIndent() +let b:undo_indent = "set cin< cino< indentkeys< indentexpr<" + " Only define the function once. if exists("*GetJavaIndent") finish diff --git a/src/eval.c b/src/eval.c index 74f985a6f..7891fcf87 100644 --- a/src/eval.c +++ b/src/eval.c @@ -5836,7 +5836,7 @@ get_dict_tv(arg, rettv, evaluate) item = dict_find(d, key, -1); if (item != NULL) { - EMSG(_("E721: Duplicate key in Dictionary")); + EMSG2(_("E721: Duplicate key in Dictionary: \"%s\""), key); clear_tv(&tvkey); clear_tv(&tv); goto failret; @@ -11218,7 +11218,7 @@ f_readfile(argvars, rettv) } filtd = 0; - while (cnt < maxline) + while (cnt < maxline || maxline < 0) { readlen = fread(buf + filtd, 1, FREAD_SIZE - filtd, fd); buflen = filtd + readlen; @@ -11267,7 +11267,7 @@ f_readfile(argvars, rettv) li->li_tv.vval.v_string = s; list_append(l, li); - if (++cnt >= maxline) + if (++cnt >= maxline && maxline >= 0) break; if (readlen <= 0) break; @@ -11307,6 +11307,17 @@ f_readfile(argvars, rettv) } } + /* + * For a negative line count use only the lines at the end of the file, + * free the rest. + */ + if (maxline < 0) + while (cnt > -maxline) + { + listitem_remove(l, l->lv_first); + --cnt; + } + vim_free(prev); fclose(fd); } |