r998 - in /trunk/packages/vim: debian/ patches/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Thu Jul 26 04:40:40 UTC 2007
Author: jamessan
Date: Thu Jul 26 04:40:36 2007
New Revision: 998
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=998
Log:
* New upstream patches (023 - 039), see README.gz for details.
* Add verilog.vim_ftplugin-cpoptions.diff, which locally enables line
continuations for the ftplugin in order to prevent an error when being run
in vi-compatible mode. (Closes: #430372)
Added:
trunk/packages/vim/patches/verilog.vim_ftplugin-cpoptions.diff
trunk/packages/vim/upstream/patches/7.1.023
trunk/packages/vim/upstream/patches/7.1.024
trunk/packages/vim/upstream/patches/7.1.025
trunk/packages/vim/upstream/patches/7.1.026
trunk/packages/vim/upstream/patches/7.1.027
trunk/packages/vim/upstream/patches/7.1.028
trunk/packages/vim/upstream/patches/7.1.029
trunk/packages/vim/upstream/patches/7.1.030
trunk/packages/vim/upstream/patches/7.1.031
trunk/packages/vim/upstream/patches/7.1.032
trunk/packages/vim/upstream/patches/7.1.033
trunk/packages/vim/upstream/patches/7.1.034
trunk/packages/vim/upstream/patches/7.1.035
trunk/packages/vim/upstream/patches/7.1.036
trunk/packages/vim/upstream/patches/7.1.037
trunk/packages/vim/upstream/patches/7.1.038
trunk/packages/vim/upstream/patches/7.1.039
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/patches/series
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=998&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Thu Jul 26 04:40:36 2007
@@ -47,3 +47,20 @@
3229 7.1.020 reading uninitialized memory when using a dialog
2875 7.1.021 (after 7.1.015) MzScheme interface doesn't build on Win32
1842 7.1.022 when setting 'keymap' twice b:keymap_name variable isn't set
+ 1718 7.1.023 "dw" in a line with one character deletes the line
+ 1335 7.1.024 using a pointer that may have become invalid
+ 2292 7.1.025 search('pat', 'bc) doesn't find word under cursor at BOL
+ 1710 7.1.026 "[p" doesn't work in Visual mode
+ 3345 7.1.027 on Sun OS reading from a process substitutions doesn't work
+ 2239 7.1.028 ":sort" does nothing special with empty search pattern
+ 2692 7.1.029 (after 7.1.019) can't compile when all interfaces are used
+ 2364 7.1.030 vimtutor shell script checks for "vim6" but not for "vim7"
+ 6533 7.1.031 virtcol([123, '$']) doesn't work
+ 3006 7.1.032 possible crash when doing completion on the command line
+ 1530 7.1.033 buffer marked modified after ":bdel" and ":next"
+ 2956 7.1.034 Win64: compiler warnings for typecast, optimizer problem
+ 1797 7.1.035 after ":s/./&/#" all listed lines have a line number
+ 12171 7.1.036 add "none" to completion of ":echohl" and ":match"
+ 1817 7.1.037 using strcpy() for an overlapping string
+ 5704 7.1.038 'preseveindent' doesn't always work when 'et' is set
+ 1750 7.1.039 weird help-tags tag in docs file may make cause a crash
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=998&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Thu Jul 26 04:40:36 2007
@@ -1,4 +1,7 @@
-vim (1:7.1-022+2) UNRELEASED; urgency=low
+vim (1:7.1-039+1) UNRELEASED; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream patches (023 - 039), see README.gz for details.
[ Pierre Habouzit ]
* Make sure reportbug vim/presubj is named that way, without a `vim.` prefix
@@ -8,7 +11,12 @@
* Add a entry to debian/NEWS describing why /usr/share/vim/addons/ is no
longer in the runtimepath and pointing to the appropriate documentation
- -- Stefano Zacchiroli <zack at debian.org> Thu, 19 Jul 2007 23:35:24 +0200
+ [ James Vega ]
+ * Add verilog.vim_ftplugin-cpoptions.diff, which locally enables line
+ continuations for the ftplugin in order to prevent an error when being run
+ in vi-compatible mode. (Closes: #430372)
+
+ -- James Vega <jamessan at debian.org> Wed, 25 Jul 2007 19:36:26 -0400
vim (1:7.1-022+1) unstable; urgency=low
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=998&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Thu Jul 26 04:40:36 2007
@@ -19,3 +19,4 @@
map.vim-syntax.diff -p0
spell.c_getc-eof.diff -p0
gui_gtk_x11.c_g_thread_init.diff -p0
+verilog.vim_ftplugin-cpoptions.diff -p0
Added: trunk/packages/vim/patches/verilog.vim_ftplugin-cpoptions.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/verilog.vim_ftplugin-cpoptions.diff?rev=998&op=file
==============================================================================
--- trunk/packages/vim/patches/verilog.vim_ftplugin-cpoptions.diff (added)
+++ trunk/packages/vim/patches/verilog.vim_ftplugin-cpoptions.diff Thu Jul 26 04:40:36 2007
@@ -1,0 +1,31 @@
+Index: vim/runtime/ftplugin/verilog.vim
+===================================================================
+--- vim/runtime/ftplugin/verilog.vim.orig
++++ vim/runtime/ftplugin/verilog.vim
+@@ -12,6 +12,10 @@
+ " Don't load another plugin for this buffer
+ let b:did_ftplugin = 1
+
++" Set 'cpoptions' to allow line continuations
++let s:cpo_save = &cpo
++set cpo&vim
++
+ " Undo the plugin effect
+ let b:undo_ftplugin = "setlocal fo< com< tw<"
+ \ . "| unlet! b:browsefilter b:match_ignorecase b:match_words"
+@@ -28,8 +32,6 @@
+ setlocal tw=78
+ endif
+
+-set cpo-=C
+-
+ " Win32 can filter files in the browse dialog
+ if has("gui_win32") && !exists("b:browsefilter")
+ let b:browsefilter = "Verilog Source Files (*.v)\t*.v\n" .
+@@ -49,3 +51,6 @@
+ \ '\<task\>:\<endtask\>,' .
+ \ '\<specify\>:\<endspecify\>'
+ endif
++
++" Reset 'cpoptions' back to the user's setting
++let &cpo = s:cpo_save
Added: trunk/packages/vim/upstream/patches/7.1.023
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.023?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.023 (added)
+++ trunk/packages/vim/upstream/patches/7.1.023 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.023
+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.023
+Problem: "dw" in a line with one character deletes the line. Vi and nvi
+ don't do this. (Kjell Arne Rekaa)
+Solution: Check for one-character words especially.
+Files: src/search.c
+
+
+*** ../vim-7.1.022/src/search.c Tue Jun 19 12:58:55 2007
+--- src/search.c Thu Jul 5 21:18:55 2007
+***************
+*** 2795,2801 ****
+ i = inc_cursor();
+ if (i == -1 || (i >= 1 && last_line)) /* started at last char in file */
+ return FAIL;
+! if (i == 1 && eol && count == 0) /* started at last char in line */
+ return OK;
+
+ /*
+--- 2802,2808 ----
+ i = inc_cursor();
+ if (i == -1 || (i >= 1 && last_line)) /* started at last char in file */
+ return FAIL;
+! if (i >= 1 && eol && count == 0) /* started at last char in line */
+ return OK;
+
+ /*
+*** ../vim-7.1.022/src/version.c Sat Jul 7 13:57:39 2007
+--- src/version.c Tue Jul 10 12:35:36 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 23,
+ /**/
+
+--
+BRIDGEKEEPER: What is your favorite editor?
+GAWAIN: Emacs ... No, Viiiiiiiiiiimmmmmmm!
+ "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE 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.024
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.024?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.024 (added)
+++ trunk/packages/vim/upstream/patches/7.1.024 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,47 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.024
+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.024
+Problem: Using a pointer that has become invalid. (Chris Monson)
+Solution: Obtain the line pointer again after we looked at another line.
+Files: src/search.c
+
+
+*** ../vim-7.1.023/src/search.c Tue Jul 10 12:36:51 2007
+--- src/search.c Thu Jul 5 21:18:55 2007
+***************
+*** 2124,2129 ****
+--- 2128,2136 ----
+ else if (!backwards)
+ inquote = TRUE;
+ }
++
++ /* ml_get() only keeps one line, need to get linep again */
++ linep = ml_get(pos.lnum);
+ }
+ }
+ }
+*** ../vim-7.1.023/src/version.c Tue Jul 10 12:36:51 2007
+--- src/version.c Tue Jul 10 13:06:02 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 24,
+ /**/
+
+--
+Q: Why does /dev/null accept only integers?
+A: You can't sink a float.
+
+ /// 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.025
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.025?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.025 (added)
+++ trunk/packages/vim/upstream/patches/7.1.025 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,72 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.025
+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.025
+Problem: search() and searchpos() don't use match under cursor at start of
+ line when using 'bc' flags. (Viktor Kojouharov)
+Solution: Don't go to the previous line when the 'c' flag is present.
+ Also fix that "j" doesn't move the cursor to the right column.
+Files: src/eval.c, src/search.c
+
+
+*** ../vim-7.1.024/src/eval.c Tue Jun 19 17:23:46 2007
+--- src/eval.c Thu Jul 5 21:16:31 2007
+***************
+*** 13925,13930 ****
+--- 13925,13932 ----
+ /* If 'n' flag is used: restore cursor position. */
+ if (flags & SP_NOMOVE)
+ curwin->w_cursor = save_cursor;
++ else
++ curwin->w_set_curswant = TRUE;
+ theend:
+ p_ws = save_p_ws;
+
+*** ../vim-7.1.024/src/search.c Tue Jul 10 13:07:08 2007
+--- src/search.c Thu Jul 5 21:18:55 2007
+***************
+*** 573,580 ****
+ /*
+ * Start searching in current line, unless searching backwards and
+ * we're in column 0.
+ */
+! if (dir == BACKWARD && start_pos.col == 0)
+ {
+ lnum = pos->lnum - 1;
+ at_first_line = FALSE;
+--- 573,584 ----
+ /*
+ * Start searching in current line, unless searching backwards and
+ * we're in column 0.
++ * If we are searching backwards, in column 0, and not including the
++ * current position, gain some efficiency by skipping back a line.
++ * Otherwise begin the search in the current line.
+ */
+! if (dir == BACKWARD && start_pos.col == 0
+! && (options & SEARCH_START) == 0)
+ {
+ lnum = pos->lnum - 1;
+ at_first_line = FALSE;
+*** ../vim-7.1.024/src/version.c Tue Jul 10 13:07:08 2007
+--- src/version.c Tue Jul 10 13:26:13 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 25,
+ /**/
+
+--
+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 ///
Added: trunk/packages/vim/upstream/patches/7.1.026
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.026?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.026 (added)
+++ trunk/packages/vim/upstream/patches/7.1.026 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,55 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.026
+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.026
+Problem: "[p" doesn't work in Visual mode. (David Brown)
+Solution: Use checkclearop() instead of checkclearopq().
+Files: src/normal.c
+
+
+*** ../vim-7.1.025/src/normal.c Thu May 10 18:45:26 2007
+--- src/normal.c Wed Jul 4 21:16:36 2007
+***************
+*** 6379,6385 ****
+ */
+ else if (cap->nchar == 'p' || cap->nchar == 'P')
+ {
+! if (!checkclearopq(cap->oap))
+ {
+ prep_redo_cmd(cap);
+ do_put(cap->oap->regname,
+--- 6379,6385 ----
+ */
+ else if (cap->nchar == 'p' || cap->nchar == 'P')
+ {
+! if (!checkclearop(cap->oap))
+ {
+ prep_redo_cmd(cap);
+ do_put(cap->oap->regname,
+*** ../vim-7.1.025/src/version.c Tue Jul 10 13:27:46 2007
+--- src/version.c Tue Jul 10 14:01:52 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 26,
+ /**/
+
+--
+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 ///
Added: trunk/packages/vim/upstream/patches/7.1.027
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.027?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.027 (added)
+++ trunk/packages/vim/upstream/patches/7.1.027 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,120 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.027
+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.027
+Problem: On Sun systems opening /dev/fd/N doesn't work, and they are used
+ by process substitutions.
+Solution: Allow opening specific character special files for Sun systems.
+ (Gary Johnson)
+Files: src/fileio.c, src/os_unix.h
+
+
+*** ../vim-7.1.026/src/fileio.c Thu Jun 28 21:57:08 2007
+--- src/fileio.c Mon Jul 9 11:19:50 2007
+***************
+*** 44,49 ****
+--- 44,53 ----
+ /* Is there any system that doesn't have access()? */
+ #define USE_MCH_ACCESS
+
++ #if defined(sun) && defined(S_ISCHR)
++ # define OPEN_CHR_FILES
++ static int is_dev_fd_file(char_u *fname);
++ #endif
+ #ifdef FEAT_MBYTE
+ static char_u *next_fenc __ARGS((char_u **pp));
+ # ifdef FEAT_EVAL
+***************
+*** 406,411 ****
+--- 410,419 ----
+ # ifdef S_ISSOCK
+ && !S_ISSOCK(perm) /* ... or socket */
+ # endif
++ # ifdef OPEN_CHR_FILES
++ && !(S_ISCHR(perm) && is_dev_fd_file(fname))
++ /* ... or a character special file named /dev/fd/<n> */
++ # endif
+ )
+ {
+ if (S_ISDIR(perm))
+***************
+*** 2265,2270 ****
+--- 2273,2285 ----
+ }
+ # endif
+ # endif
++ # ifdef OPEN_CHR_FILES
++ if (S_ISCHR(perm)) /* or character special */
++ {
++ STRCAT(IObuff, _("[character special]"));
++ c = TRUE;
++ }
++ # endif
+ #endif
+ if (curbuf->b_p_ro)
+ {
+***************
+*** 2463,2468 ****
+--- 2478,2502 ----
+ return FAIL;
+ return OK;
+ }
++
++ #ifdef OPEN_CHR_FILES
++ /*
++ * Returns TRUE if the file name argument is of the form "/dev/fd/\d\+",
++ * which is the name of files used for process substitution output by
++ * some shells on some operating systems, e.g., bash on SunOS.
++ * Do not accept "/dev/fd/[012]", opening these may hang Vim.
++ */
++ static int
++ is_dev_fd_file(fname)
++ char_u *fname;
++ {
++ return (STRNCMP(fname, "/dev/fd/", 8) == 0
++ && VIM_ISDIGIT(fname[8])
++ && *skipdigits(fname + 9) == NUL
++ && (fname[9] != NUL
++ || (fname[8] != '0' && fname[8] != '1' && fname[8] != '2')));
++ }
++ #endif
+
+ #ifdef FEAT_MBYTE
+
+*** ../vim-7.1.026/src/os_unix.h Thu May 10 19:43:10 2007
+--- src/os_unix.h Sat Jul 7 13:08:56 2007
+***************
+*** 508,513 ****
+--- 508,516 ----
+ #if !defined(S_ISFIFO) && defined(S_IFIFO)
+ # define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
+ #endif
++ #if !defined(S_ISCHR) && defined(S_IFCHR)
++ # define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
++ #endif
+
+ /* Note: Some systems need both string.h and strings.h (Savage). However,
+ * some systems can't handle both, only use string.h in that case. */
+*** ../vim-7.1.026/src/version.c Tue Jul 10 14:02:51 2007
+--- src/version.c Tue Jul 10 17:00:43 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 27,
+ /**/
+
+--
+Every exit is an entrance into something else.
+
+ /// 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.028
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.028?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.028 (added)
+++ trunk/packages/vim/upstream/patches/7.1.028 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,71 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.028
+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.028
+Problem: Can't use last search pattern for ":sort". (Brian McKee)
+Solution: When the pattern is emtpy use the last search pattern. (Martin
+ Toft)
+Files: runtime/doc/change.txt, src/ex_cmds.c
+
+
+*** ../vim-7.1.027/runtime/doc/change.txt Sat May 12 16:10:12 2007
+--- runtime/doc/change.txt Tue Jul 10 11:30:56 2007
+***************
+*** 1571,1576 ****
+--- 1571,1580 ----
+ in their original order, right before the sorted
+ lines.
+
++ If {pattern} is empty (e.g. // is specified), the
++ last search pattern is used. This allows trying out
++ a pattern first.
++
+ Note that using ":sort" with ":global" doesn't sort the matching lines, it's
+ quite useless.
+
+*** ../vim-7.1.027/src/ex_cmds.c Thu Jun 28 21:57:08 2007
+--- src/ex_cmds.c Tue Jul 10 17:25:10 2007
+***************
+*** 408,414 ****
+ goto sortend;
+ }
+ *s = NUL;
+! regmatch.regprog = vim_regcomp(p + 1, RE_MAGIC);
+ if (regmatch.regprog == NULL)
+ goto sortend;
+ p = s; /* continue after the regexp */
+--- 408,418 ----
+ goto sortend;
+ }
+ *s = NUL;
+! /* Use last search pattern if sort pattern is empty. */
+! if (s == p + 1 && last_search_pat() != NULL)
+! regmatch.regprog = vim_regcomp(last_search_pat(), RE_MAGIC);
+! else
+! regmatch.regprog = vim_regcomp(p + 1, RE_MAGIC);
+ if (regmatch.regprog == NULL)
+ goto sortend;
+ p = s; /* continue after the regexp */
+*** ../vim-7.1.027/src/version.c Tue Jul 10 17:09:51 2007
+--- src/version.c Tue Jul 10 17:20:01 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 28,
+ /**/
+
+--
+Every person is responsible for the choices he makes.
+
+ /// 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.029
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.029?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.029 (added)
+++ trunk/packages/vim/upstream/patches/7.1.029 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,84 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.029
+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.029 (after 7.1.019)
+Problem: Can't compile when all interfaces are used. (Taylor Venable)
+Solution: Only check for ex_script_ni when it's defined.
+Files: src/ex_docmd.c
+
+
+*** ../vim-7.1.028/src/ex_docmd.c Thu Jul 5 09:53:20 2007
+--- src/ex_docmd.c Sun Jul 15 17:20:09 2007
+***************
+*** 133,138 ****
+--- 133,139 ----
+ static void get_flags __ARGS((exarg_T *eap));
+ #if !defined(FEAT_PERL) || !defined(FEAT_PYTHON) || !defined(FEAT_TCL) \
+ || !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME)
++ # define HAVE_EX_SCRIPT_NI
+ static void ex_script_ni __ARGS((exarg_T *eap));
+ #endif
+ static char_u *invalid_range __ARGS((exarg_T *eap));
+***************
+*** 2119,2125 ****
+ !USER_CMDIDX(ea.cmdidx) &&
+ #endif
+ (cmdnames[ea.cmdidx].cmd_func == ex_ni
+! || cmdnames[ea.cmdidx].cmd_func == ex_script_ni));
+
+ #ifndef FEAT_EVAL
+ /*
+--- 2120,2129 ----
+ !USER_CMDIDX(ea.cmdidx) &&
+ #endif
+ (cmdnames[ea.cmdidx].cmd_func == ex_ni
+! #ifdef HAVE_EX_SCRIPT_NI
+! || cmdnames[ea.cmdidx].cmd_func == ex_script_ni
+! #endif
+! ));
+
+ #ifndef FEAT_EVAL
+ /*
+***************
+*** 3998,4005 ****
+ eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version");
+ }
+
+! #if !defined(FEAT_PERL) || !defined(FEAT_PYTHON) || !defined(FEAT_TCL) \
+! || !defined(FEAT_RUBY) || !defined(FEAT_MZSCHEME)
+ /*
+ * Function called for script command which is Not Implemented. NI!
+ * Skips over ":perl <<EOF" constructs.
+--- 3999,4005 ----
+ eap->errmsg = (char_u *)N_("E319: Sorry, the command is not available in this version");
+ }
+
+! #ifdef HAVE_EX_SCRIPT_NI
+ /*
+ * Function called for script command which is Not Implemented. NI!
+ * Skips over ":perl <<EOF" constructs.
+*** ../vim-7.1.028/src/version.c Tue Jul 10 17:25:20 2007
+--- src/version.c Mon Jul 16 20:37:48 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 29,
+ /**/
+
+--
+I used to wonder about the meaning of life. But I looked it
+up in the dictionary under "L" and there it was - the meaning
+of life. It was less than I expected. - Dogbert
+
+ /// 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.030
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.030?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.030 (added)
+++ trunk/packages/vim/upstream/patches/7.1.030 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,80 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.030
+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.030
+Problem: The "vimtutor" shell script checks for "vim6" but not for "vim7".
+ (Christian Robinson)
+Solution: Check for more versions, but prefer using "vim".
+Files: src/vimtutor
+
+
+*** ../vim-7.1.029/src/vimtutor Sun Jun 13 20:37:33 2004
+--- src/vimtutor Sun Jul 8 17:16:29 2007
+***************
+*** 39,56 ****
+ # remove the copy of the tutor on exit
+ trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15
+
+! # Vim could be called "vim" or "vi". Also check for "vim6", for people who
+! # have Vim 5.x installed as "vim" and Vim 6.0 as "vim6".
+! testvim=`which vim6 2>/dev/null`
+! if test -f "$testvim"; then
+! VIM=vim6
+! else
+! testvim=`which vim`
+ if test -f "$testvim"; then
+! VIM=vim
+! else
+! VIM=vi
+ fi
+ fi
+
+ # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME
+--- 39,60 ----
+ # remove the copy of the tutor on exit
+ trap "rm -rf $TODELETE" 0 1 2 3 9 11 13 15
+
+! # Vim could be called "vim" or "vi". Also check for "vimN", for people who
+! # have Vim installed with its version number.
+! # We anticipate up to a future Vim 8 version :-).
+! seq="vim vim8 vim75 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
+! for i in $seq; do
+! testvim=`which $i 2>/dev/null`
+ if test -f "$testvim"; then
+! VIM=$i
+! break
+ fi
++ done
++
++ # When no Vim version was found fall back to "vim", you'll get an error message
++ # below.
++ if test -z "$VIM"; then
++ VIM=vim
+ fi
+
+ # Use Vim to copy the tutor, it knows the value of $VIMRUNTIME
+*** ../vim-7.1.029/src/version.c Mon Jul 16 20:38:56 2007
+--- src/version.c Tue Jul 17 14:30:51 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 30,
+ /**/
+
+--
+BLACK KNIGHT: I'm invincible!
+ARTHUR: You're a looney.
+ "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.031
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.031?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.031 (added)
+++ trunk/packages/vim/upstream/patches/7.1.031 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,191 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.031
+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.031
+Problem: virtcol([123, '$']) doesn't work. (Michael Schaap)
+Solution: When '$' is used for the column number get the last column.
+Files: runtime/doc/eval.txt, src/eval.c
+
+
+*** ../vim-7.1.030/runtime/doc/eval.txt Tue Jun 19 17:23:46 2007
+--- runtime/doc/eval.txt Wed Jul 11 21:21:28 2007
+***************
+*** 1,4 ****
+! *eval.txt* For Vim version 7.1. Last change: 2007 Jun 09
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+--- 1,4 ----
+! *eval.txt* For Vim version 7.1. Last change: 2007 Jul 11
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+***************
+*** 2020,2025 ****
+--- 2020,2029 ----
+ number of characters in the cursor line plus one)
+ 'x position of mark x (if the mark is not set, 0 is
+ returned)
++ Additionally {expr} can be [lnum, col]: a |List| with the line
++ and column number. Most useful when the column is "$", to get
++ the las column of a specific line. When "lnum" or "col" is
++ out of range then col() returns zero.
+ To get the line number use |line()|. To get both use
+ |getpos()|.
+ For the screen column position use |virtcol()|.
+***************
+*** 5024,5037 ****
+ position, the returned Number will be the column at the end of
+ the <Tab>. For example, for a <Tab> in column 1, with 'ts'
+ set to 8, it returns 8.
+! For the use of {expr} see |col()|. Additionally you can use
+! [lnum, col]: a |List| with the line and column number. When
+! "lnum" or "col" is out of range then virtcol() returns zero.
+! When 'virtualedit' is used it can be [lnum, col, off], where
+ "off" is the offset in screen columns from the start of the
+ character. E.g., a position within a <Tab> or after the last
+ character.
+- For the byte position use |col()|.
+ When Virtual editing is active in the current mode, a position
+ beyond the end of the line can be returned. |'virtualedit'|
+ The accepted positions are:
+--- 5029,5040 ----
+ position, the returned Number will be the column at the end of
+ the <Tab>. For example, for a <Tab> in column 1, with 'ts'
+ set to 8, it returns 8.
+! For the byte position use |col()|.
+! For the use of {expr} see |col()|.
+! When 'virtualedit' is used {expr} can be [lnum, col, off], where
+ "off" is the offset in screen columns from the start of the
+ character. E.g., a position within a <Tab> or after the last
+ character.
+ When Virtual editing is active in the current mode, a position
+ beyond the end of the line can be returned. |'virtualedit'|
+ The accepted positions are:
+*** ../vim-7.1.030/src/eval.c Tue Jul 10 13:27:46 2007
+--- src/eval.c Wed Jul 11 19:50:27 2007
+***************
+*** 672,678 ****
+ static void f_writefile __ARGS((typval_T *argvars, typval_T *rettv));
+
+ static int list2fpos __ARGS((typval_T *arg, pos_T *posp, int *fnump));
+! static pos_T *var2fpos __ARGS((typval_T *varp, int lnum, int *fnum));
+ static int get_env_len __ARGS((char_u **arg));
+ static int get_id_len __ARGS((char_u **arg));
+ static int get_name_len __ARGS((char_u **arg, char_u **alias, int evaluate, int verbose));
+--- 672,678 ----
+ static void f_writefile __ARGS((typval_T *argvars, typval_T *rettv));
+
+ static int list2fpos __ARGS((typval_T *arg, pos_T *posp, int *fnump));
+! static pos_T *var2fpos __ARGS((typval_T *varp, int dollar_lnum, int *fnum));
+ static int get_env_len __ARGS((char_u **arg));
+ static int get_id_len __ARGS((char_u **arg));
+ static int get_name_len __ARGS((char_u **arg, char_u **alias, int evaluate, int verbose));
+***************
+*** 16505,16513 ****
+ * Returns NULL when there is an error.
+ */
+ static pos_T *
+! var2fpos(varp, lnum, fnum)
+ typval_T *varp;
+! int lnum; /* TRUE when $ is last line */
+ int *fnum; /* set to fnum for '0, 'A, etc. */
+ {
+ char_u *name;
+--- 16508,16516 ----
+ * Returns NULL when there is an error.
+ */
+ static pos_T *
+! var2fpos(varp, dollar_lnum, fnum)
+ typval_T *varp;
+! int dollar_lnum; /* TRUE when $ is last line */
+ int *fnum; /* set to fnum for '0, 'A, etc. */
+ {
+ char_u *name;
+***************
+*** 16520,16525 ****
+--- 16523,16529 ----
+ list_T *l;
+ int len;
+ int error = FALSE;
++ listitem_T *li;
+
+ l = varp->vval.v_list;
+ if (l == NULL)
+***************
+*** 16535,16540 ****
+--- 16539,16552 ----
+ if (error)
+ return NULL;
+ len = (long)STRLEN(ml_get(pos.lnum));
++
++ /* We accept "$" for the column number: last column. */
++ li = list_find(l, 1L);
++ if (li != NULL && li->li_tv.v_type == VAR_STRING
++ && li->li_tv.vval.v_string != NULL
++ && STRCMP(li->li_tv.vval.v_string, "$") == 0)
++ pos.col = len + 1;
++
+ /* Accept a position up to the NUL after the line. */
+ if (pos.col == 0 || (int)pos.col > len + 1)
+ return NULL; /* invalid column number */
+***************
+*** 16567,16573 ****
+ pos.coladd = 0;
+ #endif
+
+! if (name[0] == 'w' && lnum)
+ {
+ pos.col = 0;
+ if (name[1] == '0') /* "w0": first visible line */
+--- 16579,16585 ----
+ pos.coladd = 0;
+ #endif
+
+! if (name[0] == 'w' && dollar_lnum)
+ {
+ pos.col = 0;
+ if (name[1] == '0') /* "w0": first visible line */
+***************
+*** 16585,16591 ****
+ }
+ else if (name[0] == '$') /* last column or line */
+ {
+! if (lnum)
+ {
+ pos.lnum = curbuf->b_ml.ml_line_count;
+ pos.col = 0;
+--- 16597,16603 ----
+ }
+ else if (name[0] == '$') /* last column or line */
+ {
+! if (dollar_lnum)
+ {
+ pos.lnum = curbuf->b_ml.ml_line_count;
+ pos.col = 0;
+*** ../vim-7.1.030/src/version.c Tue Jul 17 14:32:07 2007
+--- src/version.c Tue Jul 17 16:24:54 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 31,
+ /**/
+
+--
+CRONE: Who sent you?
+ARTHUR: The Knights Who Say GNU!
+CRONE: Aaaagh! (she looks around in rear) No! We have no licenses here.
+ "Monty Python and the Holy editor wars" PYTHON (MONTY) SOFTWARE 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.032
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.032?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.032 (added)
+++ trunk/packages/vim/upstream/patches/7.1.032 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,97 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.032
+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.032
+Problem: Potential crash when editing a command line. (Chris Monson)
+Solution: Check the position to avoid access before the start of an array.
+Files: src/ex_getln.c
+
+
+*** ../vim-7.1.031/src/ex_getln.c Thu May 10 20:22:29 2007
+--- src/ex_getln.c Tue Jul 17 18:05:49 2007
+***************
+*** 484,490 ****
+ if (xpc.xp_context == EXPAND_MENUNAMES && p_wmnu)
+ {
+ /* Hitting <Down> after "emenu Name.": complete submenu */
+! if (ccline.cmdbuff[ccline.cmdpos - 1] == '.' && c == K_DOWN)
+ c = p_wc;
+ else if (c == K_UP)
+ {
+--- 486,493 ----
+ if (xpc.xp_context == EXPAND_MENUNAMES && p_wmnu)
+ {
+ /* Hitting <Down> after "emenu Name.": complete submenu */
+! if (c == K_DOWN && ccline.cmdpos > 0
+! && ccline.cmdbuff[ccline.cmdpos - 1] == '.')
+ c = p_wc;
+ else if (c == K_UP)
+ {
+***************
+*** 533,541 ****
+ upseg[3] = PATHSEP;
+ upseg[4] = NUL;
+
+! if (ccline.cmdbuff[ccline.cmdpos - 1] == PATHSEP
+! && c == K_DOWN
+! && (ccline.cmdbuff[ccline.cmdpos - 2] != '.'
+ || ccline.cmdbuff[ccline.cmdpos - 3] != '.'))
+ {
+ /* go down a directory */
+--- 536,546 ----
+ upseg[3] = PATHSEP;
+ upseg[4] = NUL;
+
+! if (c == K_DOWN
+! && ccline.cmdpos > 0
+! && ccline.cmdbuff[ccline.cmdpos - 1] == PATHSEP
+! && (ccline.cmdpos < 3
+! || ccline.cmdbuff[ccline.cmdpos - 2] != '.'
+ || ccline.cmdbuff[ccline.cmdpos - 3] != '.'))
+ {
+ /* go down a directory */
+***************
+*** 730,737 ****
+ /* In Ex mode a backslash escapes a newline. */
+ if (exmode_active
+ && c != ESC
+- && ccline.cmdpos > 0
+ && ccline.cmdpos == ccline.cmdlen
+ && ccline.cmdbuff[ccline.cmdpos - 1] == '\\')
+ {
+ if (c == K_KENTER)
+--- 735,742 ----
+ /* In Ex mode a backslash escapes a newline. */
+ if (exmode_active
+ && c != ESC
+ && ccline.cmdpos == ccline.cmdlen
++ && ccline.cmdpos > 0
+ && ccline.cmdbuff[ccline.cmdpos - 1] == '\\')
+ {
+ if (c == K_KENTER)
+*** ../vim-7.1.031/src/version.c Tue Jul 17 16:31:15 2007
+--- src/version.c Tue Jul 17 18:10:37 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 32,
+ /**/
+
+--
+ALL: A witch! A witch!
+WITCH: It's a fair cop.
+ALL: Burn her! Burn her! Let's make her into a ladder.
+ "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.033
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.033?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.033 (added)
+++ trunk/packages/vim/upstream/patches/7.1.033 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,48 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.033
+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.033
+Problem: A buffer is marked modified when it was first deleted and then
+ added again using a ":next" command. (John Mullin)
+Solution: When checking if a buffer is modified use the BF_NEVERLOADED flag.
+Files: src/option.c
+
+
+*** ../vim-7.1.032/src/option.c Tue Jun 19 20:56:52 2007
+--- src/option.c Sun Jul 22 16:42:47 2007
+***************
+*** 10624,10629 ****
+--- 10624,10632 ----
+ file_ff_differs(buf)
+ buf_T *buf;
+ {
++ /* In a buffer that was never loaded the options are not valid. */
++ if (buf->b_flags & BF_NEVERLOADED)
++ return FALSE;
+ if ((buf->b_flags & BF_NEW)
+ && buf->b_ml.ml_line_count == 1
+ && *ml_get_buf(buf, (linenr_T)1, FALSE) == NUL)
+*** ../vim-7.1.032/src/version.c Tue Jul 17 18:14:14 2007
+--- src/version.c Mon Jul 23 09:45:44 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 33,
+ /**/
+
+--
+How To Keep A Healthy Level Of Insanity:
+8. Don't use any punctuation marks.
+
+ /// 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.034
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.034?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.034 (added)
+++ trunk/packages/vim/upstream/patches/7.1.034 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,116 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.034
+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.034
+Problem: Win64: A few compiler warnings. Problems with optimizer.
+Solution: Use int instead of size_t. Disable the optimizer in one function.
+ (George V. Reilly)
+Files: src/eval.c, src/spell.c
+
+
+*** ../vim-7.1.033/src/eval.c Tue Jul 17 16:31:15 2007
+--- src/eval.c Wed Jul 11 19:50:27 2007
+***************
+*** 992,1011 ****
+ char_u *value;
+ int value_len;
+ {
+! size_t len;
+
+ if (redir_lval == NULL)
+ return;
+
+ if (value_len == -1)
+! len = STRLEN(value); /* Append the entire string */
+ else
+! len = value_len; /* Append only "value_len" characters */
+
+! if (ga_grow(&redir_ga, (int)len) == OK)
+ {
+ mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len);
+! redir_ga.ga_len += (int)len;
+ }
+ else
+ var_redir_stop();
+--- 992,1011 ----
+ char_u *value;
+ int value_len;
+ {
+! int len;
+
+ if (redir_lval == NULL)
+ return;
+
+ if (value_len == -1)
+! len = (int)STRLEN(value); /* Append the entire string */
+ else
+! len = value_len; /* Append only "value_len" characters */
+
+! if (ga_grow(&redir_ga, len) == OK)
+ {
+ mch_memmove((char *)redir_ga.ga_data + redir_ga.ga_len, value, len);
+! redir_ga.ga_len += len;
+ }
+ else
+ var_redir_stop();
+*** ../vim-7.1.033/src/spell.c Thu May 10 18:45:53 2007
+--- src/spell.c Sat Jul 14 17:17:52 2007
+***************
+*** 7829,7835 ****
+ # if (_MSC_VER <= 1200)
+ /* This line is required for VC6 without the service pack. Also see the
+ * matching #pragma below. */
+! /* # pragma optimize("", off) */
+ # endif
+ #endif
+
+--- 7829,7835 ----
+ # if (_MSC_VER <= 1200)
+ /* This line is required for VC6 without the service pack. Also see the
+ * matching #pragma below. */
+! # pragma optimize("", off)
+ # endif
+ #endif
+
+***************
+*** 7859,7865 ****
+
+ #ifdef _MSC_VER
+ # if (_MSC_VER <= 1200)
+! /* # pragma optimize("", on) */
+ # endif
+ #endif
+
+--- 7859,7865 ----
+
+ #ifdef _MSC_VER
+ # if (_MSC_VER <= 1200)
+! # pragma optimize("", on)
+ # endif
+ #endif
+
+*** ../vim-7.1.033/src/version.c Tue Jul 24 09:50:22 2007
+--- src/version.c Tue Jul 24 09:47:17 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 34,
+ /**/
+
+--
+How To Keep A Healthy Level Of Insanity:
+17. When the money comes out the ATM, scream "I won!, I won! 3rd
+ time this week!!!!!"
+
+ /// 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.035
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.035?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.035 (added)
+++ trunk/packages/vim/upstream/patches/7.1.035 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.035
+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.035
+Problem: After ":s/./&/#" all listed lines have a line number. (Yakov
+ Lerner)
+Solution: Reset the line number flag when not using the "&" flag.
+Files: src/ex_cmds.c
+
+
+*** ../vim-7.1.034/src/ex_cmds.c Tue Jul 10 17:25:20 2007
+--- src/ex_cmds.c Sat Jul 14 14:39:38 2007
+***************
+*** 4316,4321 ****
+--- 4316,4322 ----
+ do_error = TRUE;
+ do_print = FALSE;
+ do_count = FALSE;
++ do_number = FALSE;
+ do_ic = 0;
+ }
+ while (*cmd)
+*** ../vim-7.1.034/src/version.c Tue Jul 24 10:44:10 2007
+--- src/version.c Tue Jul 24 11:15:09 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 35,
+ /**/
+
+--
+The startling truth finally became apparent, and it was this: Numbers
+written on restaurant checks within the confines of restaurants do not follow
+the same mathematical laws as numbers written on any other pieces of paper in
+any other parts of the Universe. This single statement took the scientific
+world by storm. So many mathematical conferences got held in such good
+restaurants that many of the finest minds of a generation died of obesity and
+heart failure, and the science of mathematics was put back by years.
+ -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
+
+ /// 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.036
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.036?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.036 (added)
+++ trunk/packages/vim/upstream/patches/7.1.036 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,461 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.036
+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.036
+Problem: Completing ":echohl" argument should include "None". (Ori
+ Avtalion) ":match" should have "none" too.
+Solution: Add flags to use expand_highlight(). Also fix that when disabling
+ FEAT_CMDL_COMPL compilation fails. (Chris Lubinski)
+Files: src/eval.c, src/ex_docmd.c, src/ex_getln.c, src/proto/syntax.pro
+ src/syntax.c
+
+
+*** ../vim-7.1.035/src/eval.c Tue Jul 24 10:44:10 2007
+--- src/eval.c Wed Jul 11 19:50:27 2007
+***************
+*** 1411,1417 ****
+ }
+
+
+! #if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) || defined(PROTO)
+ /*
+ * Call some vimL function and return the result in "*rettv".
+ * Uses argv[argc] for the function arguments.
+--- 1411,1418 ----
+ }
+
+
+! #if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) \
+! || defined(FEAT_COMPL_FUNC) || defined(PROTO)
+ /*
+ * Call some vimL function and return the result in "*rettv".
+ * Uses argv[argc] for the function arguments.
+***************
+*** 1484,1489 ****
+--- 1485,1491 ----
+ return ret;
+ }
+
++ # if (defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)) || defined(PROTO)
+ /*
+ * Call vimL function "func" and return the result as a string.
+ * Returns NULL when calling the function fails.
+***************
+*** 1506,1513 ****
+ clear_tv(&rettv);
+ return retval;
+ }
+
+! #if defined(FEAT_COMPL_FUNC) || defined(PROTO)
+ /*
+ * Call vimL function "func" and return the result as a number.
+ * Returns -1 when calling the function fails.
+--- 1508,1516 ----
+ clear_tv(&rettv);
+ return retval;
+ }
++ # endif
+
+! # if defined(FEAT_COMPL_FUNC) || defined(PROTO)
+ /*
+ * Call vimL function "func" and return the result as a number.
+ * Returns -1 when calling the function fails.
+***************
+*** 1530,1536 ****
+ clear_tv(&rettv);
+ return retval;
+ }
+! #endif
+
+ /*
+ * Call vimL function "func" and return the result as a list
+--- 1533,1539 ----
+ clear_tv(&rettv);
+ return retval;
+ }
+! # endif
+
+ /*
+ * Call vimL function "func" and return the result as a list
+***************
+*** 1556,1563 ****
+
+ return rettv.vval.v_list;
+ }
+-
+ #endif
+
+ /*
+ * Save the current function call pointer, and set it to NULL.
+--- 1559,1566 ----
+
+ return rettv.vval.v_list;
+ }
+ #endif
++
+
+ /*
+ * Save the current function call pointer, and set it to NULL.
+*** ../vim-7.1.035/src/ex_docmd.c Mon Jul 16 20:38:56 2007
+--- src/ex_docmd.c Sun Jul 15 17:20:09 2007
+***************
+*** 3406,3419 ****
+ case CMD_windo:
+ return arg;
+
+! #ifdef FEAT_SEARCH_EXTRA
+ case CMD_match:
+ if (*arg == NUL || !ends_excmd(*arg))
+ {
+! /* Dummy call to clear variables. */
+! set_context_in_highlight_cmd(xp, (char_u *)"link n");
+! xp->xp_context = EXPAND_HIGHLIGHT;
+! xp->xp_pattern = arg;
+ arg = skipwhite(skiptowhite(arg));
+ if (*arg != NUL)
+ {
+--- 3406,3418 ----
+ case CMD_windo:
+ return arg;
+
+! #ifdef FEAT_CMDL_COMPL
+! # ifdef FEAT_SEARCH_EXTRA
+ case CMD_match:
+ if (*arg == NUL || !ends_excmd(*arg))
+ {
+! /* also complete "None" */
+! set_context_in_echohl_cmd(xp, arg);
+ arg = skipwhite(skiptowhite(arg));
+ if (*arg != NUL)
+ {
+***************
+*** 3422,3430 ****
+ }
+ }
+ return find_nextcmd(arg);
+! #endif
+
+- #ifdef FEAT_CMDL_COMPL
+ /*
+ * All completion for the +cmdline_compl feature goes here.
+ */
+--- 3421,3428 ----
+ }
+ }
+ return find_nextcmd(arg);
+! # endif
+
+ /*
+ * All completion for the +cmdline_compl feature goes here.
+ */
+***************
+*** 3622,3629 ****
+ break;
+
+ case CMD_echohl:
+! xp->xp_context = EXPAND_HIGHLIGHT;
+! xp->xp_pattern = arg;
+ break;
+ #endif
+ case CMD_highlight:
+--- 3620,3626 ----
+ break;
+
+ case CMD_echohl:
+! set_context_in_echohl_cmd(xp, arg);
+ break;
+ #endif
+ case CMD_highlight:
+*** ../vim-7.1.035/src/ex_getln.c Tue Jul 17 18:14:14 2007
+--- src/ex_getln.c Tue Jul 17 18:05:49 2007
+***************
+*** 268,274 ****
+--- 268,276 ----
+ {
+ xpc.xp_context = ccline.xp_context;
+ xpc.xp_pattern = ccline.cmdbuff;
++ # if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)
+ xpc.xp_arg = ccline.xp_arg;
++ # endif
+ }
+ #endif
+
+***************
+*** 4151,4163 ****
+--- 4153,4171 ----
+
+ #ifdef FEAT_EVAL
+ if (ccline.cmdfirstc == '=')
++ {
++ # ifdef FEAT_CMDL_COMPL
+ /* pass CMD_SIZE because there is no real command */
+ set_context_for_expression(xp, str, CMD_SIZE);
++ # endif
++ }
+ else if (ccline.input_fn)
+ {
+ xp->xp_context = ccline.xp_context;
+ xp->xp_pattern = ccline.cmdbuff;
++ # if defined(FEAT_USR_CMDS) && defined(FEAT_CMDL_COMPL)
+ xp->xp_arg = ccline.xp_arg;
++ # endif
+ }
+ else
+ #endif
+***************
+*** 4504,4509 ****
+--- 4512,4523 ----
+ /* Sort the results. Keep menu's in the specified order. */
+ if (xp->xp_context != EXPAND_MENUNAMES && xp->xp_context != EXPAND_MENUS)
+ sort_strings(*file, *num_file);
++
++ #ifdef FEAT_CMDL_COMPL
++ /* Reset the variables used for special highlight names expansion, so that
++ * they don't show up when getting normal highlight names by ID. */
++ reset_expand_highlight();
++ #endif
+
+ return OK;
+ }
+*** ../vim-7.1.035/src/proto/syntax.pro Sat May 5 19:23:52 2007
+--- src/proto/syntax.pro Fri Jul 13 19:51:43 2007
+***************
+*** 8,13 ****
+--- 8,15 ----
+ void syntax_clear __ARGS((buf_T *buf));
+ void ex_syntax __ARGS((exarg_T *eap));
+ int syntax_present __ARGS((buf_T *buf));
++ void reset_expand_highlight __ARGS((void));
++ void set_context_in_echohl_cmd __ARGS((expand_T *xp, char_u *arg));
+ void set_context_in_syntax_cmd __ARGS((expand_T *xp, char_u *arg));
+ char_u *get_syntax_name __ARGS((expand_T *xp, int idx));
+ int syn_get_id __ARGS((win_T *wp, long lnum, colnr_T col, int trans, int *spellp));
+*** ../vim-7.1.035/src/syntax.c Thu Jun 28 11:59:13 2007
+--- src/syntax.c Fri Jul 13 19:51:39 2007
+***************
+*** 66,73 ****
+ #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data)))
+
+ #ifdef FEAT_CMDL_COMPL
+! static int include_default = FALSE; /* include "default" for expansion */
+! static int include_link = FALSE; /* include "link" for expansion */
+ #endif
+
+ /*
+--- 66,75 ----
+ #define HL_TABLE() ((struct hl_group *)((highlight_ga.ga_data)))
+
+ #ifdef FEAT_CMDL_COMPL
+! /* Flags to indicate an additional string for highlight name completion. */
+! static int include_none = 0; /* when 1 include "None" */
+! static int include_default = 0; /* when 1 include "default" */
+! static int include_link = 0; /* when 2 include "link" and "clear" */
+ #endif
+
+ /*
+***************
+*** 5968,5973 ****
+--- 5970,5998 ----
+ EXP_CASE /* expand ":syn case" arguments */
+ } expand_what;
+
++ /*
++ * Reset include_link, include_default, include_none to 0.
++ * Called when we are done expanding.
++ */
++ void
++ reset_expand_highlight()
++ {
++ include_link = include_default = include_none = 0;
++ }
++
++ /*
++ * Handle command line completion for :match and :echohl command: Add "None"
++ * as highlight group.
++ */
++ void
++ set_context_in_echohl_cmd(xp, arg)
++ expand_T *xp;
++ char_u *arg;
++ {
++ xp->xp_context = EXPAND_HIGHLIGHT;
++ xp->xp_pattern = arg;
++ include_none = 1;
++ }
+
+ /*
+ * Handle command line completion for :syntax command.
+***************
+*** 5983,5990 ****
+ xp->xp_context = EXPAND_SYNTAX;
+ expand_what = EXP_SUBCMD;
+ xp->xp_pattern = arg;
+! include_link = FALSE;
+! include_default = FALSE;
+
+ /* (part of) subcommand already typed */
+ if (*arg != NUL)
+--- 6008,6015 ----
+ xp->xp_context = EXPAND_SYNTAX;
+ expand_what = EXP_SUBCMD;
+ xp->xp_pattern = arg;
+! include_link = 0;
+! include_default = 0;
+
+ /* (part of) subcommand already typed */
+ if (*arg != NUL)
+***************
+*** 8949,8955 ****
+ return OK;
+ }
+
+! #ifdef FEAT_CMDL_COMPL
+
+ static void highlight_list __ARGS((void));
+ static void highlight_list_two __ARGS((int cnt, int attr));
+--- 8974,8980 ----
+ return OK;
+ }
+
+! #if defined(FEAT_CMDL_COMPL) || defined(PROTO)
+
+ static void highlight_list __ARGS((void));
+ static void highlight_list_two __ARGS((int cnt, int attr));
+***************
+*** 8967,8974 ****
+ /* Default: expand group names */
+ xp->xp_context = EXPAND_HIGHLIGHT;
+ xp->xp_pattern = arg;
+! include_link = TRUE;
+! include_default = TRUE;
+
+ /* (part of) subcommand already typed */
+ if (*arg != NUL)
+--- 8992,8999 ----
+ /* Default: expand group names */
+ xp->xp_context = EXPAND_HIGHLIGHT;
+ xp->xp_pattern = arg;
+! include_link = 2;
+! include_default = 1;
+
+ /* (part of) subcommand already typed */
+ if (*arg != NUL)
+***************
+*** 8976,8982 ****
+ p = skiptowhite(arg);
+ if (*p != NUL) /* past "default" or group name */
+ {
+! include_default = FALSE;
+ if (STRNCMP("default", arg, p - arg) == 0)
+ {
+ arg = skipwhite(p);
+--- 9001,9007 ----
+ p = skiptowhite(arg);
+ if (*p != NUL) /* past "default" or group name */
+ {
+! include_default = 0;
+ if (STRNCMP("default", arg, p - arg) == 0)
+ {
+ arg = skipwhite(p);
+***************
+*** 8985,8991 ****
+ }
+ if (*p != NUL) /* past group name */
+ {
+! include_link = FALSE;
+ if (arg[1] == 'i' && arg[0] == 'N')
+ highlight_list();
+ if (STRNCMP("link", arg, p - arg) == 0
+--- 9010,9016 ----
+ }
+ if (*p != NUL) /* past group name */
+ {
+! include_link = 0;
+ if (arg[1] == 'i' && arg[0] == 'N')
+ highlight_list();
+ if (STRNCMP("link", arg, p - arg) == 0
+***************
+*** 9045,9075 ****
+ expand_T *xp;
+ int idx;
+ {
+- if (idx == highlight_ga.ga_len
+ #ifdef FEAT_CMDL_COMPL
+! && include_link
+! #endif
+! )
+ return (char_u *)"link";
+! if (idx == highlight_ga.ga_len + 1
+! #ifdef FEAT_CMDL_COMPL
+! && include_link
+! #endif
+! )
+ return (char_u *)"clear";
+- if (idx == highlight_ga.ga_len + 2
+- #ifdef FEAT_CMDL_COMPL
+- && include_default
+ #endif
+- )
+- return (char_u *)"default";
+ if (idx < 0 || idx >= highlight_ga.ga_len)
+ return NULL;
+ return HL_TABLE()[idx].sg_name;
+ }
+ #endif
+
+! #ifdef FEAT_GUI
+ /*
+ * Free all the highlight group fonts.
+ * Used when quitting for systems which need it.
+--- 9070,9094 ----
+ expand_T *xp;
+ int idx;
+ {
+ #ifdef FEAT_CMDL_COMPL
+! if (idx == highlight_ga.ga_len && include_none != 0)
+! return (char_u *)"none";
+! if (idx == highlight_ga.ga_len + include_none && include_default != 0)
+! return (char_u *)"default";
+! if (idx == highlight_ga.ga_len + include_none + include_default
+! && include_link != 0)
+ return (char_u *)"link";
+! if (idx == highlight_ga.ga_len + include_none + include_default + 1
+! && include_link != 0)
+ return (char_u *)"clear";
+ #endif
+ if (idx < 0 || idx >= highlight_ga.ga_len)
+ return NULL;
+ return HL_TABLE()[idx].sg_name;
+ }
+ #endif
+
+! #if defined(FEAT_GUI) || defined(PROTO)
+ /*
+ * Free all the highlight group fonts.
+ * Used when quitting for systems which need it.
+*** ../vim-7.1.035/src/version.c Tue Jul 24 11:15:46 2007
+--- src/version.c Tue Jul 24 14:30:18 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 36,
+ /**/
+
+--
+Apparently, 1 in 5 people in the world are Chinese. And there are 5
+people in my family, so it must be one of them. It's either my mum
+or my dad. Or my older brother Colin. Or my younger brother
+Ho-Cha-Chu. But I think it's Colin.
+
+ /// 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.037
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.037?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.037 (added)
+++ trunk/packages/vim/upstream/patches/7.1.037 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,57 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.037
+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.037
+Problem: strcpy() used for overlapping strings. (Chris Monson)
+Solution: Use mch_memmove() instead.
+Files: src/option.c
+
+
+*** ../vim-7.1.036/src/option.c Tue Jul 24 09:50:22 2007
+--- src/option.c Sun Jul 22 16:42:47 2007
+***************
+*** 4628,4634 ****
+ if ((!(flags & P_COMMA) || *s != ',')
+ && vim_strchr(s + 1, *s) != NULL)
+ {
+! STRCPY(s, s + 1);
+ --s;
+ }
+ }
+--- 4628,4634 ----
+ if ((!(flags & P_COMMA) || *s != ',')
+ && vim_strchr(s + 1, *s) != NULL)
+ {
+! mch_memmove(s, s + 1, STRLEN(s));
+ --s;
+ }
+ }
+*** ../vim-7.1.036/src/version.c Tue Jul 24 14:32:44 2007
+--- src/version.c Tue Jul 24 14:56:03 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 37,
+ /**/
+
+--
+This planet has -- or rather had -- a problem, which was this: most
+of the people living on it were unhappy for pretty much of the time.
+Many solutions were suggested for this problem, but most of these
+were largely concerned with the movements of small green pieces of
+paper, which is odd because on the whole it wasn't the small green
+pieces of paper that were unhappy.
+ -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
+
+ /// 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.038
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.038?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.038 (added)
+++ trunk/packages/vim/upstream/patches/7.1.038 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,205 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.038
+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.038
+Problem: When 'expandtab' is set then a Tab copied for 'copyindent' is
+ expanded to spaces, even when 'preserveindent' is set. (Alexei
+ Alexandrov)
+Solution: Remove the check for 'expandtab'. Also fix that ">>" doesn't obey
+ 'preserveindent'. (Chris Lubinski)
+Files: src/misc1.c
+
+
+*** ../vim-7.1.037/src/misc1.c Thu May 10 21:03:33 2007
+--- src/misc1.c Tue Jul 24 15:24:50 2007
+***************
+*** 90,96 ****
+ */
+ int
+ set_indent(size, flags)
+! int size;
+ int flags;
+ {
+ char_u *p;
+--- 90,96 ----
+ */
+ int
+ set_indent(size, flags)
+! int size; /* measured in spaces */
+ int flags;
+ {
+ char_u *p;
+***************
+*** 98,109 ****
+ char_u *oldline;
+ char_u *s;
+ int todo;
+! int ind_len;
+ int line_len;
+ int doit = FALSE;
+! int ind_done;
+ int tab_pad;
+ int retval = FALSE;
+
+ /*
+ * First check if there is anything to do and compute the number of
+--- 98,111 ----
+ char_u *oldline;
+ char_u *s;
+ int todo;
+! int ind_len; /* measured in characters */
+ int line_len;
+ int doit = FALSE;
+! int ind_done = 0; /* measured in spaces */
+ int tab_pad;
+ int retval = FALSE;
++ int orig_char_len = 0; /* number of initial whitespace chars when
++ 'et' and 'pi' are both set */
+
+ /*
+ * First check if there is anything to do and compute the number of
+***************
+*** 116,123 ****
+ /* Calculate the buffer size for the new indent, and check to see if it
+ * isn't already set */
+
+! /* if 'expandtab' isn't set: use TABs */
+! if (!curbuf->b_p_et)
+ {
+ /* If 'preserveindent' is set then reuse as much as possible of
+ * the existing indent structure for the new indent */
+--- 118,127 ----
+ /* Calculate the buffer size for the new indent, and check to see if it
+ * isn't already set */
+
+! /* if 'expandtab' isn't set: use TABs; if both 'expandtab' and
+! * 'preserveindent' are set count the number of characters at the
+! * beginning of the line to be copied */
+! if (!curbuf->b_p_et || (!(flags & SIN_INSERT) && curbuf->b_p_pi))
+ {
+ /* If 'preserveindent' is set then reuse as much as possible of
+ * the existing indent structure for the new indent */
+***************
+*** 148,156 ****
+ ++p;
+ }
+
+ /* Fill to next tabstop with a tab, if possible */
+ tab_pad = (int)curbuf->b_p_ts - (ind_done % (int)curbuf->b_p_ts);
+! if (todo >= tab_pad)
+ {
+ doit = TRUE;
+ todo -= tab_pad;
+--- 152,165 ----
+ ++p;
+ }
+
++ /* Set initial number of whitespace chars to copy if we are
++ * preserving indent but expandtab is set */
++ if (curbuf->b_p_et)
++ orig_char_len = ind_len;
++
+ /* Fill to next tabstop with a tab, if possible */
+ tab_pad = (int)curbuf->b_p_ts - (ind_done % (int)curbuf->b_p_ts);
+! if (todo >= tab_pad && orig_char_len == 0)
+ {
+ doit = TRUE;
+ todo -= tab_pad;
+***************
+*** 193,205 ****
+ else
+ p = skipwhite(p);
+ line_len = (int)STRLEN(p) + 1;
+! newline = alloc(ind_len + line_len);
+! if (newline == NULL)
+! return FALSE;
+
+ /* Put the characters in the new line. */
+- s = newline;
+- todo = size;
+ /* if 'expandtab' isn't set: use TABs */
+ if (!curbuf->b_p_et)
+ {
+--- 202,239 ----
+ else
+ p = skipwhite(p);
+ line_len = (int)STRLEN(p) + 1;
+!
+! /* If 'preserveindent' and 'expandtab' are both set keep the original
+! * characters and allocate accordingly. We will fill the rest with spaces
+! * after the if (!curbuf->b_p_et) below. */
+! if (orig_char_len != 0)
+! {
+! newline = alloc(orig_char_len + size - ind_done + line_len);
+! if (newline == NULL)
+! return FALSE;
+! p = oldline;
+! s = newline;
+! while (orig_char_len > 0)
+! {
+! *s++ = *p++;
+! orig_char_len--;
+! }
+! /* Skip over any additional white space (useful when newindent is less
+! * than old) */
+! while (vim_iswhite(*p))
+! (void)*p++;
+! todo = size-ind_done;
+! }
+! else
+! {
+! todo = size;
+! newline = alloc(ind_len + line_len);
+! if (newline == NULL)
+! return FALSE;
+! s = newline;
+! }
+
+ /* Put the characters in the new line. */
+ /* if 'expandtab' isn't set: use TABs */
+ if (!curbuf->b_p_et)
+ {
+***************
+*** 1320,1327 ****
+ newindent += (int)curbuf->b_p_sw;
+ }
+ #endif
+! /* Copy the indent only if expand tab is disabled */
+! if (curbuf->b_p_ci && !curbuf->b_p_et)
+ {
+ (void)copy_indent(newindent, saved_line);
+
+--- 1354,1361 ----
+ newindent += (int)curbuf->b_p_sw;
+ }
+ #endif
+! /* Copy the indent */
+! if (curbuf->b_p_ci)
+ {
+ (void)copy_indent(newindent, saved_line);
+
+*** ../vim-7.1.037/src/version.c Tue Jul 24 14:57:16 2007
+--- src/version.c Tue Jul 24 15:22:44 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 38,
+ /**/
+
+--
+Time is an illusion. Lunchtime doubly so.
+ -- Ford Prefect, in Douglas Adams'
+ "The Hitchhiker's Guide to the Galaxy"
+
+ /// 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.039
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.039?rev=998&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.039 (added)
+++ trunk/packages/vim/upstream/patches/7.1.039 Thu Jul 26 04:40:36 2007
@@ -1,0 +1,57 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.039
+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.039
+Problem: A tag in a help file that starts with "help-tags" and contains a
+ percent sign may make Vim crash. (Ulf Harnhammar)
+Solution: Use puts() instead of fprintf().
+Files: src/ex_cmds.c
+
+
+*** ../vim-7.1.038/src/ex_cmds.c Tue Jul 24 11:15:46 2007
+--- src/ex_cmds.c Wed Jul 25 20:06:20 2007
+***************
+*** 6374,6382 ****
+ for (i = 0; i < ga.ga_len; ++i)
+ {
+ s = ((char_u **)ga.ga_data)[i];
+! if (STRNCMP(s, "help-tags", 9) == 0)
+ /* help-tags entry was added in formatted form */
+! fprintf(fd_tags, (char *)s);
+ else
+ {
+ fprintf(fd_tags, "%s\t/*", s);
+--- 6374,6382 ----
+ for (i = 0; i < ga.ga_len; ++i)
+ {
+ s = ((char_u **)ga.ga_data)[i];
+! if (STRNCMP(s, "help-tags\t", 10) == 0)
+ /* help-tags entry was added in formatted form */
+! fputs((char *)s, fd_tags);
+ else
+ {
+ fprintf(fd_tags, "%s\t/*", s);
+*** ../vim-7.1.038/src/version.c Tue Jul 24 15:25:27 2007
+--- src/version.c Wed Jul 25 22:41:18 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 39,
+ /**/
+
+--
+On the other hand, you have different fingers.
+ -- Steven Wright
+
+ /// 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