packages: vim/vim.spec, vim/7.3.051 (NEW), vim/7.3.052 (NEW), vim/7.3.053 (...
glen
glen at pld-linux.org
Thu Nov 11 15:18:41 CET 2010
Author: glen Date: Thu Nov 11 14:18:41 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 7.3.055
---- Files affected:
packages/vim:
vim.spec (1.532 -> 1.533) , 7.3.051 (NONE -> 1.1) (NEW), 7.3.052 (NONE -> 1.1) (NEW), 7.3.053 (NONE -> 1.1) (NEW), 7.3.054 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.532 packages/vim/vim.spec:1.533
--- packages/vim/vim.spec:1.532 Thu Nov 4 12:18:09 2010
+++ packages/vim/vim.spec Thu Nov 11 15:18:35 2010
@@ -28,7 +28,7 @@
# curl -s ftp://ftp.vim.org/pub/editors/vim/patches/7.3/MD5SUMS | grep -vF .gz | tail -n1 | awk '{print $2}'
%define ver 7.3
-%define patchlevel 050
+%define patchlevel 055
%define rel 1
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
@@ -1380,6 +1380,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.533 2010/11/11 14:18:35 glen
+- up to 7.3.055
+
Revision 1.532 2010/11/04 11:18:09 glen
- up to 7.3.050
================================================================
Index: packages/vim/7.3.051
diff -u /dev/null packages/vim/7.3.051:1.1
--- /dev/null Thu Nov 11 15:18:41 2010
+++ packages/vim/7.3.051 Thu Nov 11 15:18:35 2010
@@ -0,0 +1,111 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.051
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.051
+Problem: Crash when $PATH is empty.
+Solution: Check for vim_getenv() returning NULL. (Yasuhiro Matsumoto)
+Files: src/ex_getln.c, src/os_win32.c
+
+
+*** ../vim-7.3.050/src/ex_getln.c 2010-10-27 12:58:19.000000000 +0200
+--- src/ex_getln.c 2010-11-10 15:31:33.000000000 +0100
+***************
+*** 4747,4753 ****
+--- 4747,4757 ----
+ || (pat[1] == '.' && vim_ispathsep(pat[2])))))
+ path = (char_u *)".";
+ else
++ {
+ path = vim_getenv((char_u *)"PATH", &mustfree);
++ if (path == NULL)
++ path = (char_u *)"";
++ }
+
+ /*
+ * Go over all directories in $PATH. Expand matches in that directory and
+*** ../vim-7.3.050/src/os_win32.c 2010-10-27 12:17:54.000000000 +0200
+--- src/os_win32.c 2010-11-10 15:30:36.000000000 +0100
+***************
+*** 211,223 ****
+ static void
+ get_exe_name(void)
+ {
+! char temp[MAXPATHL];
+ char_u *p;
+
+ if (exe_name == NULL)
+ {
+ /* store the name of the executable, may be used for $VIM */
+! GetModuleFileName(NULL, temp, MAXPATHL - 1);
+ if (*temp != NUL)
+ exe_name = FullName_save((char_u *)temp, FALSE);
+ }
+--- 211,226 ----
+ static void
+ get_exe_name(void)
+ {
+! /* Maximum length of $PATH is more than MAXPATHL. 8191 is often mentioned
+! * as the maximum length that works (plus a NUL byte). */
+! #define MAX_ENV_PATH_LEN 8192
+! char temp[MAX_ENV_PATH_LEN];
+ char_u *p;
+
+ if (exe_name == NULL)
+ {
+ /* store the name of the executable, may be used for $VIM */
+! GetModuleFileName(NULL, temp, MAX_ENV_PATH_LEN - 1);
+ if (*temp != NUL)
+ exe_name = FullName_save((char_u *)temp, FALSE);
+ }
+***************
+*** 232,241 ****
+ * "!xxd" it's found in our starting directory. Needed because
+ * SearchPath() also looks there. */
+ p = mch_getenv("PATH");
+! if (STRLEN(p) + STRLEN(exe_path) + 2 < MAXPATHL)
+ {
+! STRCPY(temp, p);
+! STRCAT(temp, ";");
+ STRCAT(temp, exe_path);
+ vim_setenv((char_u *)"PATH", temp);
+ }
+--- 235,250 ----
+ * "!xxd" it's found in our starting directory. Needed because
+ * SearchPath() also looks there. */
+ p = mch_getenv("PATH");
+! if (p == NULL
+! || STRLEN(p) + STRLEN(exe_path) + 2 < MAX_ENV_PATH_LEN)
+ {
+! if (p == NULL || *p == NUL)
+! temp[0] = NUL;
+! else
+! {
+! STRCPY(temp, p);
+! STRCAT(temp, ";");
+! }
+ STRCAT(temp, exe_path);
+ vim_setenv((char_u *)"PATH", temp);
+ }
+*** ../vim-7.3.050/src/version.c 2010-11-03 22:32:18.000000000 +0100
+--- src/version.c 2010-11-10 15:34:43.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 51,
+ /**/
+
+--
+SIGFUN -- signature too funny (core dumped)
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.3.052
diff -u /dev/null packages/vim/7.3.052:1.1
--- /dev/null Thu Nov 11 15:18:41 2010
+++ packages/vim/7.3.052 Thu Nov 11 15:18:35 2010
@@ -0,0 +1,345 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.052
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.052
+Problem: When 'completefunc' opens a new window all kinds of errors follow.
+ (Xavier Deguillard)
+Solution: When 'completefunc' goes to another window or buffer and when it
+ deletes text abort completion. Add a test for 'completefunc'.
+Files: src/edit.c, src/testdir/Make_amiga.mak, src/testdir/Make_dos.mak,
+ src/testdir/Make_ming.mak, src/testdir/Make_os2.mak,
+ src/testdir/Make_vms.mms, src/testdir/Makefile,
+ src/testdir/test76.in, src/testdir/test76.ok
+
+
+*** ../vim-7.3.051/src/edit.c 2010-08-15 21:57:25.000000000 +0200
+--- src/edit.c 2010-11-10 16:50:12.000000000 +0100
+***************
+*** 58,63 ****
+--- 58,67 ----
+ };
+
+ static char e_hitend[] = N_("Hit end of paragraph");
++ #ifdef FEAT_COMPL_FUNC
++ static char e_complwin[] = N_("E839: Completion function changed window");
++ static char e_compldel[] = N_("E840: Completion function deleted text");
++ #endif
+
+ /*
+ * Structure used to store one match for insert completion.
+***************
+*** 3833,3838 ****
+--- 3837,3844 ----
+ char_u *args[2];
+ char_u *funcname;
+ pos_T pos;
++ win_T *curwin_save;
++ buf_T *curbuf_save;
+
+ funcname = (type == CTRL_X_FUNCTION) ? curbuf->b_p_cfu : curbuf->b_p_ofu;
+ if (*funcname == NUL)
+***************
+*** 3843,3855 ****
+ args[1] = base;
+
+ pos = curwin->w_cursor;
+ matchlist = call_func_retlist(funcname, 2, args, FALSE);
+ curwin->w_cursor = pos; /* restore the cursor position */
+! if (matchlist == NULL)
+! return;
+
+! ins_compl_add_list(matchlist);
+! list_unref(matchlist);
+ }
+ #endif /* FEAT_COMPL_FUNC */
+
+--- 3849,3875 ----
+ args[1] = base;
+
+ pos = curwin->w_cursor;
++ curwin_save = curwin;
++ curbuf_save = curbuf;
+ matchlist = call_func_retlist(funcname, 2, args, FALSE);
++ if (curwin_save != curwin || curbuf_save != curbuf)
++ {
++ EMSG(_(e_complwin));
++ goto theend;
++ }
+ curwin->w_cursor = pos; /* restore the cursor position */
+! check_cursor();
+! if (!equalpos(curwin->w_cursor, pos))
+! {
+! EMSG(_(e_compldel));
+! goto theend;
+! }
+! if (matchlist != NULL)
+! ins_compl_add_list(matchlist);
+
+! theend:
+! if (matchlist != NULL)
+! list_unref(matchlist);
+ }
+ #endif /* FEAT_COMPL_FUNC */
+
+***************
+*** 4994,4999 ****
+--- 5014,5021 ----
+ int col;
+ char_u *funcname;
+ pos_T pos;
++ win_T *curwin_save;
++ buf_T *curbuf_save;
+
+ /* Call 'completefunc' or 'omnifunc' and get pattern length as a
+ * string */
+***************
+*** 5009,5016 ****
+--- 5031,5051 ----
+ args[0] = (char_u *)"1";
+ args[1] = NULL;
+ pos = curwin->w_cursor;
++ curwin_save = curwin;
++ curbuf_save = curbuf;
+ col = call_func_retnr(funcname, 2, args, FALSE);
++ if (curwin_save != curwin || curbuf_save != curbuf)
++ {
++ EMSG(_(e_complwin));
++ return FAIL;
++ }
+ curwin->w_cursor = pos; /* restore the cursor position */
++ check_cursor();
++ if (!equalpos(curwin->w_cursor, pos))
++ {
++ EMSG(_(e_compldel));
++ return FAIL;
++ }
+
+ if (col < 0)
+ col = curs_col;
+*** ../vim-7.3.051/src/testdir/Make_amiga.mak 2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Make_amiga.mak 2010-11-10 15:48:30.000000000 +0100
+***************
+*** 27,33 ****
+ test56.out test57.out test58.out test59.out test60.out \
+ test61.out test62.out test63.out test64.out test65.out \
+ test66.out test67.out test68.out test69.out test70.out \
+! test71.out test72.out test73.out test74.out test75.out
+
+ .SUFFIXES: .in .out
+
+--- 27,34 ----
+ test56.out test57.out test58.out test59.out test60.out \
+ test61.out test62.out test63.out test64.out test65.out \
+ test66.out test67.out test68.out test69.out test70.out \
+! test71.out test72.out test73.out test74.out test75.out \
+! test76.out
+
+ .SUFFIXES: .in .out
+
+***************
+*** 122,124 ****
+--- 123,126 ----
+ test73.out: test73.in
+ test74.out: test74.in
+ test75.out: test75.in
++ test76.out: test76.in
+*** ../vim-7.3.051/src/testdir/Make_dos.mak 2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Make_dos.mak 2010-11-10 15:48:38.000000000 +0100
+***************
+*** 28,34 ****
+ test37.out test38.out test39.out test40.out test41.out \
+ test42.out test52.out test65.out test66.out test67.out \
+ test68.out test69.out test71.out test72.out test73.out \
+! test74.out test75.out
+
+ SCRIPTS32 = test50.out test70.out
+
+--- 28,34 ----
+ test37.out test38.out test39.out test40.out test41.out \
+ test42.out test52.out test65.out test66.out test67.out \
+ test68.out test69.out test71.out test72.out test73.out \
+! test74.out test75.out test76.out
+
+ SCRIPTS32 = test50.out test70.out
+
+*** ../vim-7.3.051/src/testdir/Make_ming.mak 2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Make_ming.mak 2010-11-10 15:48:53.000000000 +0100
+***************
+*** 48,54 ****
+ test37.out test38.out test39.out test40.out test41.out \
+ test42.out test52.out test65.out test66.out test67.out \
+ test68.out test69.out test71.out test72.out test73.out \
+! test74.out test75.out
+
+ SCRIPTS32 = test50.out test70.out
+
+--- 48,54 ----
+ test37.out test38.out test39.out test40.out test41.out \
+ test42.out test52.out test65.out test66.out test67.out \
+ test68.out test69.out test71.out test72.out test73.out \
+! test74.out test75.out test76.out
+
+ SCRIPTS32 = test50.out test70.out
+
+*** ../vim-7.3.051/src/testdir/Make_os2.mak 2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Make_os2.mak 2010-11-10 15:49:10.000000000 +0100
+***************
+*** 27,33 ****
+ test56.out test57.out test58.out test59.out test60.out \
+ test61.out test62.out test63.out test64.out test65.out \
+ test66.out test67.out test68.out test69.out test70.out \
+! test71.out test72.out test73.out test74.out test75.out
+
+ .SUFFIXES: .in .out
+
+--- 27,34 ----
+ test56.out test57.out test58.out test59.out test60.out \
+ test61.out test62.out test63.out test64.out test65.out \
+ test66.out test67.out test68.out test69.out test70.out \
+! test71.out test72.out test73.out test74.out test75.out \
+! test76.out
+
+ .SUFFIXES: .in .out
+
+*** ../vim-7.3.051/src/testdir/Make_vms.mms 2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Make_vms.mms 2010-11-10 15:49:32.000000000 +0100
+***************
+*** 4,10 ****
+ # Authors: Zoltan Arpadffy, <arpadffy at polarhome.com>
+ # Sandor Kopanyi, <sandor.kopanyi at mailbox.hu>
+ #
+! # Last change: 2010 Oct 20
+ #
+ # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
+ # Edit the lines in the Configuration section below to select.
+--- 4,10 ----
+ # Authors: Zoltan Arpadffy, <arpadffy at polarhome.com>
+ # Sandor Kopanyi, <sandor.kopanyi at mailbox.hu>
+ #
+! # Last change: 2010 Nov 10
+ #
+ # This has been tested on VMS 6.2 to 8.3 on DEC Alpha, VAX and IA64.
+ # Edit the lines in the Configuration section below to select.
+***************
+*** 74,80 ****
+ test56.out test57.out test60.out \
+ test61.out test62.out test63.out test64.out test65.out \
+ test66.out test67.out test68.out test69.out \
+! test71.out test72.out test74.out test75.out
+
+ # Known problems:
+ # Test 30: a problem around mac format - unknown reason
+--- 74,80 ----
+ test56.out test57.out test60.out \
+ test61.out test62.out test63.out test64.out test65.out \
+ test66.out test67.out test68.out test69.out \
+! test71.out test72.out test74.out test75.out test76.out
+
+ # Known problems:
+ # Test 30: a problem around mac format - unknown reason
+*** ../vim-7.3.051/src/testdir/Makefile 2010-10-27 18:36:32.000000000 +0200
+--- src/testdir/Makefile 2010-11-10 15:47:32.000000000 +0100
+***************
+*** 25,31 ****
+ test59.out test60.out test61.out test62.out test63.out \
+ test64.out test65.out test66.out test67.out test68.out \
+ test69.out test70.out test71.out test72.out test73.out \
+! test74.out test75.out
+
+ SCRIPTS_GUI = test16.out
+
+--- 25,31 ----
+ test59.out test60.out test61.out test62.out test63.out \
+ test64.out test65.out test66.out test67.out test68.out \
+ test69.out test70.out test71.out test72.out test73.out \
+! test74.out test75.out test76.out
+
+ SCRIPTS_GUI = test16.out
+
+*** ../vim-7.3.051/src/testdir/test76.in 2010-11-10 16:51:45.000000000 +0100
+--- src/testdir/test76.in 2010-11-10 16:38:45.000000000 +0100
+***************
+*** 0 ****
+--- 1,46 ----
++ Tests for completefunc/omnifunc. vim: set ft=vim :
++
++ STARTTEST
++ :"Test that nothing happens if the 'completefunc' opens
++ :"a new window (no completion, no crash)
++ :so small.vim
++ :function! DummyCompleteOne(findstart, base)
++ : if a:findstart
++ : return 0
++ : else
++ : wincmd n
++ : return ['onedef', 'oneDEF']
++ : endif
++ :endfunction
++ :setlocal completefunc=DummyCompleteOne
++ /^one
++ A:q!
++ :function! DummyCompleteTwo(findstart, base)
++ : if a:findstart
++ : wincmd n
++ : return 0
++ : else
++ : return ['twodef', 'twoDEF']
++ : endif
++ :endfunction
++ :setlocal completefunc=DummyCompleteTwo
++ /^two
++ A:q!
++ :"Test that 'completefunc' works when it's OK.
++ :function! DummyCompleteThree(findstart, base)
++ : if a:findstart
++ : return 0
++ : else
++ : return ['threedef', 'threeDEF']
++ : endif
++ :endfunction
++ :setlocal completefunc=DummyCompleteThree
++ /^three
++ A:/^+++/,/^three/w! test.out
++ :qa!
++ ENDTEST
++
++ +++
++ one
++ two
++ three
+*** ../vim-7.3.051/src/testdir/test76.ok 2010-11-10 16:51:45.000000000 +0100
+--- src/testdir/test76.ok 2010-11-10 16:38:58.000000000 +0100
+***************
+*** 0 ****
+--- 1,4 ----
++ +++
++
++ two
++ threeDEF
+*** ../vim-7.3.051/src/version.c 2010-11-10 15:37:00.000000000 +0100
+--- src/version.c 2010-11-10 16:40:29.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 52,
+ /**/
+
+--
+BRIDGEKEEPER: What is the air-speed velocity of an unladen swallow?
+ARTHUR: What do you mean? An African or European swallow?
+BRIDGEKEEPER: Er ... I don't know that ... Aaaaarrrrrrggghhh!
+ BRIDGEKEEPER is cast into the gorge.
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.3.053
diff -u /dev/null packages/vim/7.3.053:1.1
--- /dev/null Thu Nov 11 15:18:41 2010
+++ packages/vim/7.3.053 Thu Nov 11 15:18:35 2010
@@ -0,0 +1,89 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.053
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.053
+Problem: complete() function doesn't reset complete direction. Can't use
+ an empty string in the list of matches.
+Solution: Set compl_direction to FORWARD. Add "empty" key to allow empty
+ words. (Kikuchan)
+Files: src/edit.c
+
+
+*** ../vim-7.3.052/src/edit.c 2010-11-10 16:54:16.000000000 +0100
+--- src/edit.c 2010-11-10 17:03:23.000000000 +0100
+***************
+*** 2662,2667 ****
+--- 2662,2668 ----
+ if (stop_arrow() == FAIL)
+ return;
+
++ compl_direction = FORWARD;
+ if (startcol > curwin->w_cursor.col)
+ startcol = curwin->w_cursor.col;
+ compl_col = startcol;
+***************
+*** 3909,3914 ****
+--- 3910,3916 ----
+ char_u *word;
+ int icase = FALSE;
+ int adup = FALSE;
++ int aempty = FALSE;
+ char_u *(cptext[CPT_COUNT]);
+
+ if (tv->v_type == VAR_DICT && tv->vval.v_dict != NULL)
+***************
+*** 3926,3938 ****
+ icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");
+ if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)
+ adup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");
+ }
+ else
+ {
+ word = get_tv_string_chk(tv);
+ vim_memset(cptext, 0, sizeof(cptext));
+ }
+! if (word == NULL || *word == NUL)
+ return FAIL;
+ return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, adup);
+ }
+--- 3928,3942 ----
+ icase = get_dict_number(tv->vval.v_dict, (char_u *)"icase");
+ if (get_dict_string(tv->vval.v_dict, (char_u *)"dup", FALSE) != NULL)
+ adup = get_dict_number(tv->vval.v_dict, (char_u *)"dup");
++ if (get_dict_string(tv->vval.v_dict, (char_u *)"empty", FALSE) != NULL)
++ aempty = get_dict_number(tv->vval.v_dict, (char_u *)"empty");
+ }
+ else
+ {
+ word = get_tv_string_chk(tv);
+ vim_memset(cptext, 0, sizeof(cptext));
+ }
+! if (word == NULL || (!aempty && *word == NUL))
+ return FAIL;
+ return ins_compl_add(word, -1, icase, NULL, cptext, dir, 0, adup);
+ }
+*** ../vim-7.3.052/src/version.c 2010-11-10 16:54:16.000000000 +0100
+--- src/version.c 2010-11-10 17:10:39.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 53,
+ /**/
+
+--
+BEDEVERE: How do you know so much about swallows?
+ARTHUR: Well you have to know these things when you're a king, you know.
+ "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.3.054
diff -u /dev/null packages/vim/7.3.054:1.1
--- /dev/null Thu Nov 11 15:18:42 2010
+++ packages/vim/7.3.054 Thu Nov 11 15:18:35 2010
@@ -0,0 +1,112 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.054
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.532&r2=1.533&f=u
More information about the pld-cvs-commit
mailing list