updated for version 7.0229

runtime/autoload/ccomplete.vim

@@ -1,7 +1,7 @@
 " Vim completion script
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Mar 11
+" Last Change:	2006 Mar 19
 
 
 " This function is used for the 'omnifunc' option.

runtime/doc/quickfix.txt

@@ -1,4 +1,4 @@
-*quickfix.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 09
+*quickfix.txt*  For Vim version 7.0aa.  Last change: 2006 Mar 19
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -882,13 +882,15 @@ prefixes are:
 	%Z		end of a multi-line message
 These can be used with '+' and '-', see |efm-ignore| below.
 
+Using "\n" in the pattern won't work to match multi-line messages.
+
 Example: Your compiler happens to write out errors in the following format
 (leading line numbers not being part of the actual output):
 
-     1	Error 275
+     1	Error 275 ~
-     2	line 42
+     2	line 42 ~
-     3	column 3
+     3	column 3 ~
-     4	' ' expected after '--'
+     4	' ' expected after '--' ~
 
 The appropriate error format string has to look like this: >
    :set efm=%EError\ %n,%Cline\ %l,%Ccolumn\ %c,%Z%m
@@ -928,6 +930,16 @@ it also hides line 7 which would trigger a separate error message otherwise.
 Error format strings are always parsed pattern by pattern until the first
 match occurs.
 
+Important: There is no memory of what part of the errorformat matched before;
+every line in the error file gets a complete new run through the error format
+lines.  For example, if one has: >
+  setlocal efm=aa,bb,cc,dd,ee
+Where aa, bb, etc. are error format strings.  Each line of the error file will
+be matched to the pattern aa, then bb, then cc, etc.  Just because cc matched
+the previous error line does _not_ mean that dd will be tried first on the
+current line, even if cc and dd are multi-line errorformat strings.
+
+
 
 Separate file name			*errorformat-separate-filename*
 
@@ -994,14 +1006,16 @@ with previous versions of Vim.  However, it is also possible to specify
 Since meta characters of the regular expression language can be part of
 ordinary matching strings or file names (and therefore internally have to
 be escaped), meta symbols have to be written with leading '%':
-	%\		the single '\' character.  Note that this has to be
+	%\		The single '\' character.  Note that this has to be
 			escaped ("%\\") in ":set errorformat=" definitions.
-	%.		the single '.' character.
+	%.		The single '.' character.
-	%#		the single '*'(!) character.
+	%#		The single '*'(!) character.
-	%^		the single '^' character.
+	%^		The single '^' character.  Note that this is not
-	%$		the single '$' character.
+			useful, the pattern already matches start of line.
-	%[		the single '[' character for a [] character range.
+	%$		The single '$' character.  Note that this is not
-	%~		the single '~' character.
+			useful, the pattern already matches end of line.
+	%[		The single '[' character for a [] character range.
+	%~		The single '~' character.
 When using character classes in expressions (see |/\i| for an overview),
 terms containing the "\+" quantifier can be written in the scanf() "%*"
 notation.  Example: "%\\d%\\+" ("\d\+", "any number") is equivalent to "%*\\d".

runtime/doc/todo.txt

@@ -1,4 +1,4 @@
-*todo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 18
+*todo.txt*      For Vim version 7.0aa.  Last change: 2006 Mar 19
 
 
 		  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 -----------------------
 
-'cindent' isn't remove when Esc is typed.
+'errorformat': Add a flag %? to check for a match with the next item first.
+Helps for continuation lines that may contain just about anything, e.g. an
+error message.
+    error 99 in file foo.c line 1234:
+	something is wrong here
 
 Gnome GUI: lots of error messages during startup.  These go away when not
 using the notebook for tab labels.  Still similar error messages when moving
@@ -51,7 +55,7 @@ EMBEDDING: Make it possible to run Vim inside a window of another program.
 For GTK Neil Bird has a patch to use Vim like a widget.
 
 Ctags still hasn't included the patch.  Darren is looking for someone to do
-maintanance.  Is there another solution?
+maintenance.  Is there another solution?
 
 HTML indenting can be slow, find out why.
 Add a function to get the current time in usec.  reltime([start, [end]])
@@ -63,11 +67,6 @@ Profiling:
     - :profile pause
     - :profile resume
 
-'errorformat' docs are a bit unclear.  Suggestions by Charles Campbell (2006
-Jan 6)
-Add a flag to check for a match with the next item first?  Helps for
-continuation lines that may contain just about anything.
-
 Adjust src/main.aap for installing manpages like in Makefile.
     And for generating Vim.app for the Mac.
     Install spell files with src/main.aap.
@@ -75,9 +74,6 @@ Adjust src/main.aap for installing manpages like in Makefile.
 Add ":smap", Select mode mapping?  Otherwise: ":sunmap", so that Visual mode
 mappings for normal keys can be removed from Select mode.
 
-Check if file explorer can handle directory names and links with a single
-quote. (Nieko Maatjes, 2005 Jan 4)
-
 Add more tests for all new functionality in Vim 7.  Especially new functions.
 
 Add text in user manual for using the undo tree.  Example with finding the

src/eval.c

@@ -8184,27 +8184,7 @@ f_complete_add(argvars, rettv)
     typval_T	*argvars;
     typval_T	*rettv;
 {
-    char_u	*word;
+    rettv->vval.v_number = ins_compl_add_tv(&argvars[0], 0);
-    char_u	*kind = NULL;
-    char_u	*extra = NULL;
-    char_u	*info = NULL;
-    int		icase = FALSE;
-
-    if (argvars[0].v_type == VAR_DICT && argvars[0].vval.v_dict != NULL)
-    {
-	word = get_dict_string(argvars[0].vval.v_dict, (char_u *)"word", FALSE);
-	kind = get_dict_string(argvars[0].vval.v_dict, (char_u *)"kind", FALSE);
-	extra = get_dict_string(argvars[0].vval.v_dict,
-						     (char_u *)"menu", FALSE);
-	info = get_dict_string(argvars[0].vval.v_dict,
-						     (char_u *)"info", FALSE);
-	icase = get_dict_number(argvars[0].vval.v_dict, (char_u *)"icase");
-    }
-    else
-	word = get_tv_string_chk(&argvars[0]);
-    if (word != NULL)
-	rettv->vval.v_number = ins_compl_add(word, -1, icase,
-					       NULL, kind, extra, info, 0, 0);
 }
 
 /*

src/proto/edit.pro

@@ -8,12 +8,13 @@ void truncate_spaces __ARGS((char_u *line));
 void backspace_until_column __ARGS((int col));
 int vim_is_ctrl_x_key __ARGS((int c));
 int ins_compl_add_infercase __ARGS((char_u *str, int len, int icase, char_u *fname, int dir, int flags));
-int ins_compl_add __ARGS((char_u *str, int len, int icase, char_u *fname, char_u *kind, char_u *extra, char_u *info, int cdir, int flags));
+int ins_compl_add __ARGS((char_u *str, int len, int icase, char_u *fname, char_u **cptext, int cdir, int flags));
 void set_completion __ARGS((int startcol, list_T *list));
 void ins_compl_show_pum __ARGS((void));
 char_u *find_word_start __ARGS((char_u *ptr));
 char_u *find_word_end __ARGS((char_u *ptr));
 int ins_compl_active __ARGS((void));
+int ins_compl_add_tv __ARGS((typval_T *tv, int dir));
 void ins_compl_check_keys __ARGS((int frequency));
 int get_literal __ARGS((void));
 void insertchar __ARGS((int c, int flags, int second_indent));