r1143 - in /trunk/packages/vim: debian/ patches/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Wed Jan 2 16:22:33 UTC 2008
Author: jamessan
Date: Wed Jan 2 16:22:33 2008
New Revision: 1143
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1143
Log:
* New upstream patches (176 - 183), see README.gz for details.
Refresh configure-tcl_detection.diff
Added:
trunk/packages/vim/upstream/patches/7.1.176
trunk/packages/vim/upstream/patches/7.1.177
trunk/packages/vim/upstream/patches/7.1.178
trunk/packages/vim/upstream/patches/7.1.179
trunk/packages/vim/upstream/patches/7.1.180
trunk/packages/vim/upstream/patches/7.1.181
trunk/packages/vim/upstream/patches/7.1.182
trunk/packages/vim/upstream/patches/7.1.183
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/patches/configure-tcl_detection.diff
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1143&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed Jan 2 16:22:33 2008
@@ -204,3 +204,11 @@
1928 7.1.173 accessing freed memory when using "\%^" pattern
2197 7.1.174 writing NUL past end of a buffer
4722 7.1.175 <BS> doesn't work with some combination of option settings
+ 2943 7.1.176 compiling with Aap fails if "compiledby" contains '<' or '>'
+ 5450 7.1.177 freeing memory twice when in debug mode while reading a script
+ 1567 7.1.178 "%" doesn't work on "/* comment *//* comment */"
+ 6581 7.1.179 configure doesn't find TCL 8.5
+ 7099 7.1.180 regexp patterns are not sufficiently tested
+ 1878 7.1.181 accessing uninitialized memory in Farsi mode with ":s"
+ 5457 7.1.182 with tab pages and an argument list session file may be wrong
+ 2489 7.1.183 Internal error for ":echo matchstr('a', 'a\%[\&]')"
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1143&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Jan 2 16:22:33 2008
@@ -1,5 +1,9 @@
-vim (1:7.1-175+3) UNRELEASED; urgency=low
-
+vim (1:7.1-183+1) UNRELEASED; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream patches (176 - 183), see README.gz for details.
+
+ [ James Vega ]
* Add configure-tcl_detection.diff, which allows Vim's configure script to
detect Tcl again after the Tcl maintainers decision to move
/usr/lib/tcl8.4/ to /usr/share/tcltk/tcl8.4/.
@@ -9,7 +13,7 @@
- Drop versioning from Build-Depends that are available in Sarge.
- Drop unnecessary ruby and perl Build-Depends.
- -- James Vega <jamessan at debian.org> Fri, 21 Dec 2007 09:37:07 -0500
+ -- James Vega <jamessan at debian.org> Wed, 02 Jan 2008 11:21:46 -0500
vim (1:7.1-175+2) unstable; urgency=low
Modified: trunk/packages/vim/patches/configure-tcl_detection.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/configure-tcl_detection.diff?rev=1143&op=diff
==============================================================================
--- trunk/packages/vim/patches/configure-tcl_detection.diff (original)
+++ trunk/packages/vim/patches/configure-tcl_detection.diff Wed Jan 2 16:22:33 2008
@@ -2,7 +2,7 @@
===================================================================
--- vim/src/auto/configure.orig
+++ vim/src/auto/configure
-@@ -4627,7 +4627,7 @@
+@@ -4669,7 +4669,7 @@
echo "$as_me:$LINENO: checking for location of Tcl include" >&5
echo $ECHO_N "checking for location of Tcl include... $ECHO_C" >&6
if test "x$MACOSX" != "xyes"; then
Added: trunk/packages/vim/upstream/patches/7.1.176
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.176?rev=1143&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.176 (added)
+++ trunk/packages/vim/upstream/patches/7.1.176 Wed Jan 2 16:22:33 2008
@@ -1,0 +1,88 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.176
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.176
+Problem: Building with Aap fails when the "compiledby" argument contains
+ '<' or '>' characters. (Alex Yeh)
+Solution: Change how quoting is done in the Aap recipe.
+Files: src/main.aap
+
+
+*** ../vim-7.1.175/src/main.aap Tue Sep 25 22:13:14 2007
+--- src/main.aap Fri Dec 7 17:03:31 2007
+***************
+*** 63,70 ****
+ @else:
+ @ arch = "ppc"
+ :print Building for $arch system
+ :sys CONFIG_STATUS=auto/config.status
+! ./configure.aap `file2string("config.arg")`
+ --with-mac-arch=$arch
+ --cache-file=auto/config.cache
+
+--- 63,71 ----
+ @else:
+ @ arch = "ppc"
+ :print Building for $arch system
++ config_args = `file2string("config.arg")`
+ :sys CONFIG_STATUS=auto/config.status
+! ./configure.aap $config_args
+ --with-mac-arch=$arch
+ --cache-file=auto/config.cache
+
+***************
+*** 440,450 ****
+ :print >> $target char_u *all_lflags = (char_u *)"$linkcmd";
+ @if _no.get("COMPILEDBY"):
+ who = $COMPILEDBY
+! where = ''
+ @else:
+ :syseval whoami | :eval re.sub("\n", "", stdin) | :assign who
+
+ :syseval hostname | :eval re.sub("\n", "", stdin) | :assign where
+ :print >> $target char_u *compiled_user = (char_u *)"$who";
+ :print >> $target char_u *compiled_sys = (char_u *)"$where";
+
+--- 441,453 ----
+ :print >> $target char_u *all_lflags = (char_u *)"$linkcmd";
+ @if _no.get("COMPILEDBY"):
+ who = $COMPILEDBY
+! where =
+ @else:
+ :syseval whoami | :eval re.sub("\n", "", stdin) | :assign who
+
+ :syseval hostname | :eval re.sub("\n", "", stdin) | :assign where
++ @who = string.replace(who, '"', '\\"')
++ @where = string.replace(where, '"', '\\"')
+ :print >> $target char_u *compiled_user = (char_u *)"$who";
+ :print >> $target char_u *compiled_sys = (char_u *)"$where";
+
+*** ../vim-7.1.175/src/version.c Sun Dec 9 20:25:59 2007
+--- src/version.c Mon Dec 31 16:40:01 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 176,
+ /**/
+
+--
+E M A C S
+s e l o h
+c t t n i
+a a t f
+p r t
+e o
+ l
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.1.177
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.177?rev=1143&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.177 (added)
+++ trunk/packages/vim/upstream/patches/7.1.177 Wed Jan 2 16:22:33 2008
@@ -1,0 +1,193 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.177
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.177
+Problem: Freeing memory twice when in debug mode while reading a script.
+Solution: Ignore script input while in debug mode.
+Files: src/ex_cmds2.c, src/getchar.c, src/globals.h
+
+
+*** ../vim-7.1.176/src/ex_cmds2.c Thu May 10 20:55:46 2007
+--- src/ex_cmds2.c Tue Jan 1 14:13:41 2008
+***************
+*** 93,98 ****
+--- 93,100 ----
+ int save_emsg_silent = emsg_silent;
+ int save_redir_off = redir_off;
+ tasave_T typeaheadbuf;
++ int typeahead_saved = FALSE;
++ int save_ignore_script;
+ # ifdef FEAT_EX_EXTRA
+ int save_ex_normal_busy;
+ # endif
+***************
+*** 159,176 ****
+ * This makes sure we get input from the user here and don't interfere
+ * with the commands being executed. Reset "ex_normal_busy" to avoid
+ * the side effects of using ":normal". Save the stuff buffer and make
+! * it empty. */
+ # ifdef FEAT_EX_EXTRA
+ save_ex_normal_busy = ex_normal_busy;
+ ex_normal_busy = 0;
+ # endif
+ if (!debug_greedy)
+ save_typeahead(&typeaheadbuf);
+
+ cmdline = getcmdline_prompt('>', NULL, 0, EXPAND_NOTHING, NULL);
+
+! if (!debug_greedy)
+ restore_typeahead(&typeaheadbuf);
+ # ifdef FEAT_EX_EXTRA
+ ex_normal_busy = save_ex_normal_busy;
+ # endif
+--- 161,186 ----
+ * This makes sure we get input from the user here and don't interfere
+ * with the commands being executed. Reset "ex_normal_busy" to avoid
+ * the side effects of using ":normal". Save the stuff buffer and make
+! * it empty. Set ignore_script to avoid reading from script input. */
+ # ifdef FEAT_EX_EXTRA
+ save_ex_normal_busy = ex_normal_busy;
+ ex_normal_busy = 0;
+ # endif
+ if (!debug_greedy)
++ {
+ save_typeahead(&typeaheadbuf);
++ typeahead_saved = TRUE;
++ save_ignore_script = ignore_script;
++ ignore_script = TRUE;
++ }
+
+ cmdline = getcmdline_prompt('>', NULL, 0, EXPAND_NOTHING, NULL);
+
+! if (typeahead_saved)
+! {
+ restore_typeahead(&typeaheadbuf);
++ ignore_script = save_ignore_script;
++ }
+ # ifdef FEAT_EX_EXTRA
+ ex_normal_busy = save_ex_normal_busy;
+ # endif
+*** ../vim-7.1.176/src/getchar.c Fri Dec 7 17:30:04 2007
+--- src/getchar.c Tue Jan 1 14:11:42 2008
+***************
+*** 1279,1286 ****
+ void
+ free_typebuf()
+ {
+! vim_free(typebuf.tb_buf);
+! vim_free(typebuf.tb_noremap);
+ }
+
+ /*
+--- 1279,1292 ----
+ void
+ free_typebuf()
+ {
+! if (typebuf.tb_buf == typebuf_init)
+! EMSG2(_(e_intern2), "Free typebuf 1");
+! else
+! vim_free(typebuf.tb_buf);
+! if (typebuf.tb_buf == noremapbuf_init)
+! EMSG2(_(e_intern2), "Free typebuf 2");
+! else
+! vim_free(typebuf.tb_noremap);
+ }
+
+ /*
+***************
+*** 1359,1364 ****
+--- 1365,1375 ----
+ EMSG(_(e_nesting));
+ return;
+ }
++ #ifdef FEAT_EVAL
++ if (ignore_script)
++ /* Not reading from script, also don't open one. Warning message? */
++ return;
++ #endif
+
+ if (scriptin[curscript] != NULL) /* already reading script */
+ ++curscript;
+***************
+*** 2346,2352 ****
+ current_menu->silent[idx]);
+ }
+ }
+! #endif /* FEAT_GUI */
+ continue; /* try mapping again */
+ }
+
+--- 2357,2363 ----
+ current_menu->silent[idx]);
+ }
+ }
+! #endif /* FEAT_GUI && FEAT_MENU */
+ continue; /* try mapping again */
+ }
+
+***************
+*** 2862,2872 ****
+ undo_off = FALSE; /* restart undo now */
+
+ /*
+! * first try script file
+! * If interrupted: Stop reading script files.
+ */
+ script_char = -1;
+! while (scriptin[curscript] != NULL && script_char < 0)
+ {
+ if (got_int || (script_char = getc(scriptin[curscript])) < 0)
+ {
+--- 2873,2887 ----
+ undo_off = FALSE; /* restart undo now */
+
+ /*
+! * Get a character from a script file if there is one.
+! * If interrupted: Stop reading script files, close them all.
+ */
+ script_char = -1;
+! while (scriptin[curscript] != NULL && script_char < 0
+! #ifdef FEAT_EVAL
+! && !ignore_script
+! #endif
+! )
+ {
+ if (got_int || (script_char = getc(scriptin[curscript])) < 0)
+ {
+*** ../vim-7.1.176/src/globals.h Sat Sep 29 14:15:00 2007
+--- src/globals.h Mon Dec 31 17:00:21 2007
+***************
+*** 954,959 ****
+--- 954,962 ----
+ EXTERN int ex_normal_busy INIT(= 0); /* recursiveness of ex_normal() */
+ EXTERN int ex_normal_lock INIT(= 0); /* forbid use of ex_normal() */
+ #endif
++ #ifdef FEAT_EVAL
++ EXTERN int ignore_script INIT(= FALSE); /* ignore script input */
++ #endif
+ EXTERN int stop_insert_mode; /* for ":stopinsert" and 'insertmode' */
+
+ EXTERN int KeyTyped; /* TRUE if user typed current char */
+*** ../vim-7.1.176/src/version.c Mon Dec 31 16:41:31 2007
+--- src/version.c Tue Jan 1 14:00:09 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 177,
+ /**/
+
+--
+Back up my hard drive? I can't find the reverse switch!
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.1.178
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.178?rev=1143&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.178 (added)
+++ trunk/packages/vim/upstream/patches/7.1.178 Wed Jan 2 16:22:33 2008
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.178
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.178
+Problem: "%" doesn't work on "/* comment *//* comment */".
+Solution: Don't handle the "//" in "*//*" as a C++ comment. (Markus
+ Heidelberg)
+Files: src/search.c
+
+
+*** ../vim-7.1.177/src/search.c Wed Aug 8 22:48:16 2007
+--- src/search.c Mon Dec 10 21:21:17 2007
+***************
+*** 2319,2325 ****
+ #endif
+ while ((p = vim_strchr(p, '/')) != NULL)
+ {
+! if (p[1] == '/')
+ break;
+ ++p;
+ }
+--- 2319,2327 ----
+ #endif
+ while ((p = vim_strchr(p, '/')) != NULL)
+ {
+! /* accept a double /, unless it's preceded with * and followed by *,
+! * because * / / * is an end and start of a C comment */
+! if (p[1] == '/' && (p == line || p[-1] != '*' || p[2] != '*'))
+ break;
+ ++p;
+ }
+*** ../vim-7.1.177/src/version.c Tue Jan 1 14:16:42 2008
+--- src/version.c Tue Jan 1 15:41:33 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 178,
+ /**/
+
+--
+I'd like to meet the man who invented sex and see what he's working on now.
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.1.179
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.179?rev=1143&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.179 (added)
+++ trunk/packages/vim/upstream/patches/7.1.179 Wed Jan 2 16:22:33 2008
@@ -1,0 +1,189 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.179
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.179
+Problem: Need to check for TCL 8.5.
+Solution: Adjust configure script. (Alexey Froloff)
+Files: src/configure.in, src/auto/configure
+
+
+*** ../vim-7.1.178/src/configure.in Sun Nov 4 15:35:23 2007
+--- src/configure.in Sun Dec 30 13:55:28 2007
+***************
+*** 759,773 ****
+
+ if test "$enable_tclinterp" = "yes"; then
+
+! dnl on FreeBSD tclsh is a silly script, look for tclsh8.[420]
+ AC_MSG_CHECKING(--with-tclsh argument)
+ AC_ARG_WITH(tclsh, [ --with-tclsh=PATH which tclsh to use (default: tclsh8.0)],
+ tclsh_name="$withval"; AC_MSG_RESULT($tclsh_name),
+! tclsh_name="tclsh8.4"; AC_MSG_RESULT(no))
+ AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name)
+ AC_SUBST(vi_cv_path_tcl)
+
+! dnl when no specific version specified, also try 8.2 and 8.0
+ if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then
+ tclsh_name="tclsh8.2"
+ AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name)
+--- 759,777 ----
+
+ if test "$enable_tclinterp" = "yes"; then
+
+! dnl on FreeBSD tclsh is a silly script, look for tclsh8.[5420]
+ AC_MSG_CHECKING(--with-tclsh argument)
+ AC_ARG_WITH(tclsh, [ --with-tclsh=PATH which tclsh to use (default: tclsh8.0)],
+ tclsh_name="$withval"; AC_MSG_RESULT($tclsh_name),
+! tclsh_name="tclsh8.5"; AC_MSG_RESULT(no))
+ AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name)
+ AC_SUBST(vi_cv_path_tcl)
+
+! dnl when no specific version specified, also try 8.4, 8.2 and 8.0
+! if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.5"; then
+! tclsh_name="tclsh8.4"
+! AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name)
+! fi
+ if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then
+ tclsh_name="tclsh8.2"
+ AC_PATH_PROG(vi_cv_path_tcl, $tclsh_name)
+***************
+*** 810,815 ****
+--- 814,820 ----
+ AC_MSG_CHECKING(for location of tclConfig.sh script)
+ if test "x$MACOSX" != "xyes"; then
+ tclcnf=`echo $tclinc | sed s/include/lib/g`
++ tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
+ else
+ dnl For Mac OS X 10.3, use the OS-provided framework location
+ tclcnf="/System/Library/Frameworks/Tcl.framework"
+***************
+*** 830,835 ****
+--- 835,841 ----
+ AC_MSG_RESULT(<not found>)
+ AC_MSG_CHECKING(for Tcl library by myself)
+ tcllib=`echo $tclinc | sed s/include/lib/g`
++ tcllib="$tcllib `echo $tclinc | sed s/include/lib64/g`"
+ for ext in .so .a ; do
+ for ver in "" $tclver ; do
+ for try in $tcllib ; do
+*** ../vim-7.1.178/src/auto/configure Sun Nov 4 15:35:23 2007
+--- src/auto/configure Sun Dec 30 13:55:35 2007
+***************
+*** 4445,4451 ****
+ tclsh_name="$withval"; echo "$as_me:$LINENO: result: $tclsh_name" >&5
+ echo "${ECHO_T}$tclsh_name" >&6
+ else
+! tclsh_name="tclsh8.4"; echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi;
+ # Extract the first word of "$tclsh_name", so it can be a program name with args.
+--- 4445,4451 ----
+ tclsh_name="$withval"; echo "$as_me:$LINENO: result: $tclsh_name" >&5
+ echo "${ECHO_T}$tclsh_name" >&6
+ else
+! tclsh_name="tclsh8.5"; echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi;
+ # Extract the first word of "$tclsh_name", so it can be a program name with args.
+***************
+*** 4489,4495 ****
+
+
+
+! if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then
+ tclsh_name="tclsh8.2"
+ # Extract the first word of "$tclsh_name", so it can be a program name with args.
+ set dummy $tclsh_name; ac_word=$2
+--- 4489,4537 ----
+
+
+
+! if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.5"; then
+! tclsh_name="tclsh8.4"
+! # Extract the first word of "$tclsh_name", so it can be a program name with args.
+! set dummy $tclsh_name; ac_word=$2
+! echo "$as_me:$LINENO: checking for $ac_word" >&5
+! echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+! if test "${ac_cv_path_vi_cv_path_tcl+set}" = set; then
+! echo $ECHO_N "(cached) $ECHO_C" >&6
+! else
+! case $vi_cv_path_tcl in
+! [\\/]* | ?:[\\/]*)
+! ac_cv_path_vi_cv_path_tcl="$vi_cv_path_tcl" # Let the user override the test with a path.
+! ;;
+! *)
+! as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+! for as_dir in $PATH
+! do
+! IFS=$as_save_IFS
+! test -z "$as_dir" && as_dir=.
+! for ac_exec_ext in '' $ac_executable_extensions; do
+! if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+! ac_cv_path_vi_cv_path_tcl="$as_dir/$ac_word$ac_exec_ext"
+! echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+! break 2
+! fi
+! done
+! done
+!
+! ;;
+! esac
+! fi
+! vi_cv_path_tcl=$ac_cv_path_vi_cv_path_tcl
+!
+! if test -n "$vi_cv_path_tcl"; then
+! echo "$as_me:$LINENO: result: $vi_cv_path_tcl" >&5
+! echo "${ECHO_T}$vi_cv_path_tcl" >&6
+! else
+! echo "$as_me:$LINENO: result: no" >&5
+! echo "${ECHO_T}no" >&6
+! fi
+!
+! fi
+! if test "X$vi_cv_path_tcl" = "X" -a $tclsh_name = "tclsh8.4"; then
+ tclsh_name="tclsh8.2"
+ # Extract the first word of "$tclsh_name", so it can be a program name with args.
+ set dummy $tclsh_name; ac_word=$2
+***************
+*** 4649,4654 ****
+--- 4691,4697 ----
+ echo $ECHO_N "checking for location of tclConfig.sh script... $ECHO_C" >&6
+ if test "x$MACOSX" != "xyes"; then
+ tclcnf=`echo $tclinc | sed s/include/lib/g`
++ tclcnf="$tclcnf `echo $tclinc | sed s/include/lib64/g`"
+ else
+ tclcnf="/System/Library/Frameworks/Tcl.framework"
+ fi
+***************
+*** 4668,4673 ****
+--- 4711,4717 ----
+ echo "$as_me:$LINENO: checking for Tcl library by myself" >&5
+ echo $ECHO_N "checking for Tcl library by myself... $ECHO_C" >&6
+ tcllib=`echo $tclinc | sed s/include/lib/g`
++ tcllib="$tcllib `echo $tclinc | sed s/include/lib64/g`"
+ for ext in .so .a ; do
+ for ver in "" $tclver ; do
+ for try in $tcllib ; do
+*** ../vim-7.1.178/src/version.c Tue Jan 1 15:42:45 2008
+--- src/version.c Tue Jan 1 16:24:07 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 179,
+ /**/
+
+--
+Just think of all the things we haven't thought of yet.
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.1.180
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.180?rev=1143&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.180 (added)
+++ trunk/packages/vim/upstream/patches/7.1.180 Wed Jan 2 16:22:33 2008
@@ -1,0 +1,266 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.180
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.180
+Problem: Regexp patterns not tested sufficiently.
+Solution: Add more checks to the regexp test.
+Files: src/testdir/test64.in, src/testdir/test64.ok
+
+
+*** ../vim-7.1.179/src/testdir/test64.in Tue Sep 25 17:54:41 2007
+--- src/testdir/test64.in Mon Dec 31 14:20:23 2007
+***************
+*** 14,23 ****
+--- 14,136 ----
+ :" etc.
+ :" When there is no match use only the first two items.
+ :let tl = []
++ :call add(tl, ['ab', 'aab', 'ab'])
+ :call add(tl, ['b', 'abcdef', 'b'])
+ :call add(tl, ['bc*', 'abccccdef', 'bcccc'])
+ :call add(tl, ['bc\{-}', 'abccccdef', 'b'])
+ :call add(tl, ['bc\{-}\(d\)', 'abccccdef', 'bccccd', 'd'])
++ :call add(tl, ['bc*', 'abbdef', 'b'])
++ :call add(tl, ['c*', 'ccc', 'ccc'])
++ :call add(tl, ['bc*', 'abdef', 'b'])
++ :call add(tl, ['c*', 'abdef', ''])
++ :call add(tl, ['bc\+', 'abccccdef', 'bcccc'])
++ :call add(tl, ['bc\+', 'abdef']) "no match
++ :"
++ :"operator \|
++ :call add(tl, ['a\|ab', 'cabd', 'a']) "alternation is ordered
++ :"
++ :call add(tl, ['c\?', 'ccb', 'c'])
++ :call add(tl, ['bc\?', 'abd', 'b'])
++ :call add(tl, ['bc\?', 'abccd', 'bc'])
++ :"
++ :call add(tl, ['\va{1}', 'ab', 'a'])
++ :"
++ :call add(tl, ['\va{2}', 'aa', 'aa'])
++ :call add(tl, ['\va{2}', 'caad', 'aa'])
++ :call add(tl, ['\va{2}', 'aba'])
++ :call add(tl, ['\va{2}', 'ab'])
++ :call add(tl, ['\va{2}', 'abaa', 'aa'])
++ :call add(tl, ['\va{2}', 'aaa', 'aa'])
++ :"
++ :call add(tl, ['\vb{1}', 'abca', 'b'])
++ :call add(tl, ['\vba{2}', 'abaa', 'baa'])
++ :call add(tl, ['\vba{3}', 'aabaac'])
++ :"
++ :call add(tl, ['\v(ab){1}', 'ab', 'ab', 'ab'])
++ :call add(tl, ['\v(ab){1}', 'dabc', 'ab', 'ab'])
++ :call add(tl, ['\v(ab){1}', 'acb'])
++ :"
++ :call add(tl, ['\v(ab){0,2}', 'acb', "", ""])
++ :call add(tl, ['\v(ab){0,2}', 'ab', 'ab', 'ab'])
++ :call add(tl, ['\v(ab){1,2}', 'ab', 'ab', 'ab'])
++ :call add(tl, ['\v(ab){1,2}', 'ababc', 'abab', 'ab'])
++ :call add(tl, ['\v(ab){2,4}', 'ababcab', 'abab', 'ab'])
++ :call add(tl, ['\v(ab){2,4}', 'abcababa', 'abab', 'ab'])
++ :"
++ :call add(tl, ['\v(ab){2}', 'abab', 'abab', 'ab'])
++ :call add(tl, ['\v(ab){2}', 'cdababe', 'abab', 'ab'])
++ :call add(tl, ['\v(ab){2}', 'abac'])
++ :call add(tl, ['\v(ab){2}', 'abacabab', 'abab', 'ab'])
++ :call add(tl, ['\v((ab){2}){2}', 'abababab', 'abababab', 'abab', 'ab'])
++ :call add(tl, ['\v((ab){2}){2}', 'abacabababab', 'abababab', 'abab', 'ab'])
++ :"
++ :call add(tl, ['\v(a{1}){1}', 'a', 'a', 'a'])
++ :call add(tl, ['\v(a{2}){1}', 'aa', 'aa', 'aa'])
++ :call add(tl, ['\v(a{2}){1}', 'aaac', 'aa', 'aa'])
++ :call add(tl, ['\v(a{2}){1}', 'daaac', 'aa', 'aa'])
++ :call add(tl, ['\v(a{1}){2}', 'daaac', 'aa', 'a'])
++ :call add(tl, ['\v(a{1}){2}', 'aaa', 'aa', 'a'])
++ :call add(tl, ['\v(a{2})+', 'adaac', 'aa', 'aa'])
++ :call add(tl, ['\v(a{2})+', 'aa', 'aa', 'aa'])
++ :call add(tl, ['\v(a{2}){1}', 'aa', 'aa', 'aa'])
++ :call add(tl, ['\v(a{1}){2}', 'aa', 'aa', 'a'])
++ :call add(tl, ['\v(a{1}){1}', 'a', 'a', 'a'])
++ :call add(tl, ['\v(a{2}){2}', 'aaaa', 'aaaa', 'aa'])
++ :call add(tl, ['\v(a{2}){2}', 'aaabaaaa', 'aaaa', 'aa'])
++ :"
++ :call add(tl, ['\v(a+){2}', 'dadaac', 'aa', 'a'])
++ :call add(tl, ['\v(a{3}){2}', 'aaaaaaa', 'aaaaaa', 'aaa'])
++ :"
++ :call add(tl, ['\v(a{1,2}){2}', 'daaac', 'aaa', 'a'])
++ :call add(tl, ['\v(a{1,3}){2}', 'daaaac', 'aaaa', 'a'])
++ :call add(tl, ['\v(a{1,3}){2}', 'daaaaac', 'aaaaa', 'aa'])
++ :call add(tl, ['\v(a{1,3}){3}', 'daac'])
++ :call add(tl, ['\v(a{1,2}){2}', 'dac'])
++ :call add(tl, ['\v(a+)+', 'daac', 'aa', 'aa'])
++ :call add(tl, ['\v(a+)+', 'aaa', 'aaa', 'aaa'])
++ :call add(tl, ['\v(a+){1,2}', 'aaa', 'aaa', 'aaa'])
++ :call add(tl, ['\v(a+)(a+)', 'aaa', 'aaa', 'aa', 'a'])
++ :call add(tl, ['\v(a{3})+', 'daaaac', 'aaa', 'aaa'])
++ :call add(tl, ['\v(a|b|c)+', 'aacb', 'aacb', 'b'])
++ :call add(tl, ['\v(a|b|c){2}', 'abcb', 'ab', 'b'])
++ :call add(tl, ['\v(abc){2}', 'abcabd', ])
++ :call add(tl, ['\v(abc){2}', 'abdabcabc','abcabc', 'abc'])
++ :"
++ :call add(tl, ['a*', 'cc', ''])
++ :call add(tl, ['\v(a*)+', 'cc', ''])
++ :call add(tl, ['\v((ab)+)+', 'ab', 'ab', 'ab', 'ab'])
++ :call add(tl, ['\v(((ab)+)+)+', 'ab', 'ab', 'ab', 'ab', 'ab'])
++ :call add(tl, ['\v(((ab)+)+)+', 'dababc', 'abab', 'abab', 'abab', 'ab'])
++ :call add(tl, ['\v(a{0,2})+', 'cc', ''])
++ :call add(tl, ['\v(a*)+', '', ''])
++ :call add(tl, ['\v((a*)+)+', '', ''])
++ :call add(tl, ['\v((ab)*)+', '', ''])
++ :call add(tl, ['\va{1,3}', 'aab', 'aa'])
++ :call add(tl, ['\va{2,3}', 'abaa', 'aa'])
++ :"
++ :call add(tl, ['\v((ab)+|c*)+', 'abcccaba', 'abcccab', '', 'ab'])
++ :call add(tl, ['\v(a{2})|(b{3})', 'bbabbbb', 'bbb', '', 'bbb'])
++ :call add(tl, ['\va{2}|b{2}', 'abab'])
++ :call add(tl, ['\v(a)+|(c)+', 'bbacbaacbbb', 'a', 'a'])
++ :call add(tl, ['\vab{2,3}c', 'aabbccccccccccccc', 'abbc'])
++ :call add(tl, ['\vab{2,3}c', 'aabbbccccccccccccc', 'abbbc'])
++ :call add(tl, ['\vab{2,3}cd{2,3}e', 'aabbbcddee', 'abbbcdde'])
++ :call add(tl, ['\va(bc){2}d', 'aabcbfbc' ])
++ :call add(tl, ['\va*a{2}', 'a', ])
++ :call add(tl, ['\va*a{2}', 'aa', 'aa' ])
++ :call add(tl, ['\va*a{2}', 'aaa', 'aaa' ])
++ :call add(tl, ['\va*a{2}', 'bbbabcc', ])
++ :call add(tl, ['\va*b*|a*c*', 'a', 'a'])
++ :call add(tl, ['\va{1}b{1}|a{1}b{1}', ''])
++ :"
++ :"submatches
++ :call add(tl, ['\v(a)', 'ab', 'a', 'a'])
++ :call add(tl, ['\v(a)(b)', 'ab', 'ab', 'a', 'b'])
++ :call add(tl, ['\v(ab)(b)(c)', 'abbc', 'abbc', 'ab', 'b', 'c'])
++ :call add(tl, ['\v((a)(b))', 'ab', 'ab', 'ab', 'a', 'b'])
++ :call add(tl, ['\v(a)|(b)', 'ab', 'a', 'a'])
++ :"
++ :call add(tl, ['\v(a*)+', 'aaaa', 'aaaa', ''])
+ :call add(tl, ['x', 'abcdef'])
+ :"
+ :for t in tl
+*** ../vim-7.1.179/src/testdir/test64.ok Tue Aug 14 17:28:14 2007
+--- src/testdir/test64.ok Mon Dec 31 14:20:26 2007
+***************
+*** 4,6 ****
+--- 4,102 ----
+ OK
+ OK
+ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
++ OK
+*** ../vim-7.1.179/src/version.c Tue Jan 1 16:25:33 2008
+--- src/version.c Tue Jan 1 17:34:32 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 180,
+ /**/
+
+--
+CONCORDE: Message for you, sir.
+ He falls forward revealing the arrow with the note.
+ "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 ///
Added: trunk/packages/vim/upstream/patches/7.1.181
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.181?rev=1143&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.181 (added)
+++ trunk/packages/vim/upstream/patches/7.1.181 Wed Jan 2 16:22:33 2008
@@ -1,0 +1,62 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.181
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.181
+Problem: Accessing uninitialized memory in Farsi mode. (Dominuque Pelle)
+Solution: Only invoke lrF_sub() when there is something to do.
+Files: src/ex_cmds.c
+
+
+*** ../vim-7.1.180/src/ex_cmds.c Sun Dec 9 19:37:37 2007
+--- src/ex_cmds.c Mon Dec 31 17:29:25 2007
+***************
+*** 4212,4222 ****
+ sub_nlines = 0;
+ }
+
+- #ifdef FEAT_FKMAP /* reverse the flow of the Farsi characters */
+- if (p_altkeymap && curwin->w_p_rl)
+- lrF_sub(cmd);
+- #endif
+-
+ if (eap->cmdidx == CMD_tilde)
+ which_pat = RE_LAST; /* use last used regexp */
+ else
+--- 4212,4217 ----
+***************
+*** 4252,4257 ****
+--- 4247,4256 ----
+ }
+ else /* find the end of the regexp */
+ {
++ #ifdef FEAT_FKMAP /* reverse the flow of the Farsi characters */
++ if (p_altkeymap && curwin->w_p_rl)
++ lrF_sub(cmd);
++ #endif
+ which_pat = RE_LAST; /* use last used regexp */
+ delimiter = *cmd++; /* remember delimiter character */
+ pat = cmd; /* remember start of search pat */
+*** ../vim-7.1.180/src/version.c Tue Jan 1 17:37:01 2008
+--- src/version.c Wed Jan 2 13:57:31 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 181,
+ /**/
+
+--
+Yah, well, we had to carve our electrons out of driftwood we'd
+find. In the winter. Uphill. Both ways.
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.1.182
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.182?rev=1143&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.182 (added)
+++ trunk/packages/vim/upstream/patches/7.1.182 Wed Jan 2 16:22:33 2008
@@ -1,0 +1,169 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.182
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.182
+Problem: When using tab pages and an argument list the session file may
+ contain wrong "next" commands. (Alexander Bluem)
+Solution: Use "argu" commands and only when needed.
+Files: src/ex_docmd.c
+
+
+*** ../vim-7.1.181/src/ex_docmd.c Sun Dec 9 19:37:37 2007
+--- src/ex_docmd.c Mon Dec 31 18:24:16 2007
+***************
+*** 372,378 ****
+ static char_u *arg_all __ARGS((void));
+ #ifdef FEAT_SESSION
+ static int makeopens __ARGS((FILE *fd, char_u *dirnow));
+! static int put_view __ARGS((FILE *fd, win_T *wp, int add_edit, unsigned *flagp));
+ static void ex_loadview __ARGS((exarg_T *eap));
+ static char_u *get_view_file __ARGS((int c));
+ static int did_lcd; /* whether ":lcd" was produced for a session */
+--- 372,378 ----
+ static char_u *arg_all __ARGS((void));
+ #ifdef FEAT_SESSION
+ static int makeopens __ARGS((FILE *fd, char_u *dirnow));
+! static int put_view __ARGS((FILE *fd, win_T *wp, int add_edit, unsigned *flagp, int current_arg_idx));
+ static void ex_loadview __ARGS((exarg_T *eap));
+ static char_u *get_view_file __ARGS((int c));
+ static int did_lcd; /* whether ":lcd" was produced for a session */
+***************
+*** 8762,8768 ****
+ }
+ else
+ {
+! failed |= (put_view(fd, curwin, !using_vdir, flagp) == FAIL);
+ }
+ if (put_line(fd, "let &so = s:so_save | let &siso = s:siso_save")
+ == FAIL)
+--- 8762,8769 ----
+ }
+ else
+ {
+! failed |= (put_view(fd, curwin, !using_vdir, flagp,
+! -1) == FAIL);
+ }
+ if (put_line(fd, "let &so = s:so_save | let &siso = s:siso_save")
+ == FAIL)
+***************
+*** 9761,9766 ****
+--- 9762,9769 ----
+ int tabnr;
+ win_T *tab_firstwin;
+ frame_T *tab_topframe;
++ int cur_arg_idx = 0;
++ int next_arg_idx;
+
+ if (ssop_flags & SSOP_BUFFERS)
+ only_save_windows = FALSE; /* Save ALL buffers */
+***************
+*** 9976,9987 ****
+ {
+ if (!ses_do_win(wp))
+ continue;
+! if (put_view(fd, wp, wp != edited_win, &ssop_flags) == FAIL)
+ return FAIL;
+ if (nr > 1 && put_line(fd, "wincmd w") == FAIL)
+ return FAIL;
+ }
+
+ /*
+ * Restore cursor to the current window if it's not the first one.
+ */
+--- 9979,9997 ----
+ {
+ if (!ses_do_win(wp))
+ continue;
+! if (put_view(fd, wp, wp != edited_win, &ssop_flags,
+! cur_arg_idx) == FAIL)
+ return FAIL;
+ if (nr > 1 && put_line(fd, "wincmd w") == FAIL)
+ return FAIL;
++ next_arg_idx = wp->w_arg_idx;
+ }
+
++ /* The argument index in the first tab page is zero, need to set it in
++ * each window. For further tab pages it's the window where we do
++ * "tabedit". */
++ cur_arg_idx = next_arg_idx;
++
+ /*
+ * Restore cursor to the current window if it's not the first one.
+ */
+***************
+*** 10190,10200 ****
+ * Caller must make sure 'scrolloff' is zero.
+ */
+ static int
+! put_view(fd, wp, add_edit, flagp)
+ FILE *fd;
+ win_T *wp;
+ int add_edit; /* add ":edit" command to view */
+ unsigned *flagp; /* vop_flags or ssop_flags */
+ {
+ win_T *save_curwin;
+ int f;
+--- 10200,10212 ----
+ * Caller must make sure 'scrolloff' is zero.
+ */
+ static int
+! put_view(fd, wp, add_edit, flagp, current_arg_idx)
+ FILE *fd;
+ win_T *wp;
+ int add_edit; /* add ":edit" command to view */
+ unsigned *flagp; /* vop_flags or ssop_flags */
++ int current_arg_idx; /* current argument index of the window, use
++ * -1 if unknown */
+ {
+ win_T *save_curwin;
+ int f;
+***************
+*** 10224,10233 ****
+
+ /* Only when part of a session: restore the argument index. Some
+ * arguments may have been deleted, check if the index is valid. */
+! if (wp->w_arg_idx != 0 && wp->w_arg_idx <= WARGCOUNT(wp)
+ && flagp == &ssop_flags)
+ {
+! if (fprintf(fd, "%ldnext", (long)wp->w_arg_idx) < 0
+ || put_eol(fd) == FAIL)
+ return FAIL;
+ did_next = TRUE;
+--- 10236,10245 ----
+
+ /* Only when part of a session: restore the argument index. Some
+ * arguments may have been deleted, check if the index is valid. */
+! if (wp->w_arg_idx != current_arg_idx && wp->w_arg_idx <= WARGCOUNT(wp)
+ && flagp == &ssop_flags)
+ {
+! if (fprintf(fd, "%ldargu", (long)wp->w_arg_idx + 1) < 0
+ || put_eol(fd) == FAIL)
+ return FAIL;
+ did_next = TRUE;
+*** ../vim-7.1.181/src/version.c Wed Jan 2 13:58:17 2008
+--- src/version.c Wed Jan 2 15:10:01 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 182,
+ /**/
+
+--
+You were lucky. We lived for three months in a brown paper bag in a
+septic tank. We used to have to get up at six o'clock in the morning,
+clean the bag, eat a crust of stale bread, go to work down mill for
+fourteen hours a day week in-week out. When we got home, our Dad
+would thrash us to sleep with his belt!
+
+ /// 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 ///
Added: trunk/packages/vim/upstream/patches/7.1.183
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.183?rev=1143&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.183 (added)
+++ trunk/packages/vim/upstream/patches/7.1.183 Wed Jan 2 16:22:33 2008
@@ -1,0 +1,99 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.183
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.183
+Problem: "Internal error" for ":echo matchstr('a', 'a\%[\&]')" (Mitanu
+ Paul)
+Solution: Inside "\%[]" detect \&, \| and \) as an error.
+Files: src/regexp.c
+
+
+*** ../vim-7.1.182/src/regexp.c Sun Dec 9 19:25:35 2007
+--- src/regexp.c Wed Jan 2 15:02:37 2008
+***************
+*** 1288,1295 ****
+ }
+
+ /*
+! * regbranch - one alternative of an | operator
+! *
+ * Implements the & operator.
+ */
+ static char_u *
+--- 1288,1294 ----
+ }
+
+ /*
+! * Handle one alternative of an | operator.
+ * Implements the & operator.
+ */
+ static char_u *
+***************
+*** 1330,1337 ****
+ }
+
+ /*
+! * regbranch - one alternative of an | or & operator
+! *
+ * Implements the concatenation operator.
+ */
+ static char_u *
+--- 1329,1335 ----
+ }
+
+ /*
+! * Handle one alternative of an | or & operator.
+ * Implements the concatenation operator.
+ */
+ static char_u *
+***************
+*** 1708,1713 ****
+--- 1706,1713 ----
+ case Magic('|'):
+ case Magic('&'):
+ case Magic(')'):
++ if (one_exactly)
++ EMSG_ONE_RET_NULL;
+ EMSG_RET_NULL(_(e_internal)); /* Supposed to be caught earlier. */
+ /* NOTREACHED */
+
+***************
+*** 3106,3112 ****
+ * slow, we keep one allocated piece of memory and only re-allocate it when
+ * it's too small. It's freed in vim_regexec_both() when finished.
+ */
+! static char_u *reg_tofree;
+ static unsigned reg_tofreelen;
+
+ /*
+--- 3106,3112 ----
+ * slow, we keep one allocated piece of memory and only re-allocate it when
+ * it's too small. It's freed in vim_regexec_both() when finished.
+ */
+! static char_u *reg_tofree = NULL;
+ static unsigned reg_tofreelen;
+
+ /*
+*** ../vim-7.1.182/src/version.c Wed Jan 2 15:12:29 2008
+--- src/version.c Wed Jan 2 15:33:52 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 183,
+ /**/
+
+--
+Not too long ago, unzipping in public was illegal...
+
+ /// 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 ///
More information about the pkg-vim-maintainers
mailing list