r776 - in /trunk/packages/vim: debian/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue Oct 3 16:04:10 UTC 2006
Author: jamessan
Date: Tue Oct 3 16:04:08 2006
New Revision: 776
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=776
Log:
Upstream patches 110-118
Added:
trunk/packages/vim/upstream/patches/7.0.110
trunk/packages/vim/upstream/patches/7.0.111
trunk/packages/vim/upstream/patches/7.0.112
trunk/packages/vim/upstream/patches/7.0.113
trunk/packages/vim/upstream/patches/7.0.114
trunk/packages/vim/upstream/patches/7.0.115
trunk/packages/vim/upstream/patches/7.0.116
trunk/packages/vim/upstream/patches/7.0.117
trunk/packages/vim/upstream/patches/7.0.118
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=776&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Oct 3 16:04:08 2006
@@ -134,3 +134,12 @@
1805 7.0.107 tab pages line was not redrawn when using 'incsearch'
2583 7.0.108 (extra) Amiga: compilation error for mch_mkdir()
1923 7.0.109 Lisp indenting gets confused by an escaped quote in a string
+ 2557 7.0.110 Amiga: Compilation problems when not using libnix
+ 10411 7.0.111 gzip plugin can't handle file names with special characters
+ 2687 7.0.112 Python interface doesn't compile with Python 2.5
+ 1878 7.0.113 crash when using CTRL-L in Insert mode completion
+ 1964 7.0.114 get extra undo point when using CTRL-C to abort Insert mode
+ 2339 7.0.115 missing some matches when Insert mode completion ignores case
+ 1508 7.0.116 MS-Windows: :version reported 32 bits for 64 bits systems
+ 5028 7.0.117 problem when mixing keepend and extend in syntax highlighting
+ 1529 7.0.118 printf() doesn't allow zero padding for strings
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=776&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Oct 3 16:04:08 2006
@@ -1,7 +1,7 @@
-vim (1:7.0-109+1) unstable; urgency=low
+vim (1:7.0-118+1) unstable; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (095 - 109), see README.gz for details.
+ * New upstream patches (095 - 118), see README.gz for details.
[ James Vega ]
* Since vim-gui-common no longer depends on vim-common (to allow for
@@ -18,7 +18,7 @@
usage of perldoc/pydoc/ri for keyword lookup on perl/python/ruby files.
(closes: #389332)
- -- Stefano Zacchiroli <zack at debian.org> Mon, 25 Sep 2006 12:25:38 +0200
+ -- James Vega <jamessan at debian.org> Tue, 3 Oct 2006 12:03:32 -0400
vim (1:7.0-094+1) unstable; urgency=medium
Added: trunk/packages/vim/upstream/patches/7.0.110
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.110?rev=776&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.110 (added)
+++ trunk/packages/vim/upstream/patches/7.0.110 Tue Oct 3 16:04:08 2006
@@ -1,0 +1,88 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.110
+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.0.110
+Problem: Amiga: Compilation problems when not using libnix.
+Solution: Change a few #ifdefs. (Willy Catteau)
+Files: src/memfile.c
+
+
+*** ../vim-7.0.109/src/memfile.c Tue Mar 7 00:27:12 2006
+--- src/memfile.c Sun Sep 17 15:50:00 2006
+***************
+*** 517,523 ****
+ mf_ins_free(mfp, hp); /* put *hp in the free list */
+ }
+
+! #if defined(__MORPHOS__)
+ /* function is missing in MorphOS libnix version */
+ extern unsigned long *__stdfiledes;
+
+--- 517,523 ----
+ mf_ins_free(mfp, hp); /* put *hp in the free list */
+ }
+
+! #if defined(__MORPHOS__) && defined(__libnix__)
+ /* function is missing in MorphOS libnix version */
+ extern unsigned long *__stdfiledes;
+
+***************
+*** 677,691 ****
+ # else
+ # if defined(_DCC) || defined(__GNUC__) || defined(__MORPHOS__)
+ {
+! # if defined(__GNUC__) && !defined(__MORPHOS__)
+ /* Have function (in libnix at least),
+ * but ain't got no prototype anywhere. */
+ extern unsigned long fdtofh(int filedescriptor);
+ # endif
+ BPTR fh = (BPTR)fdtofh(mfp->mf_fd);
+
+ if (fh != 0)
+ Flush(fh);
+ }
+ # else /* assume Manx */
+ Flush(_devtab[mfp->mf_fd].fd);
+--- 677,695 ----
+ # else
+ # if defined(_DCC) || defined(__GNUC__) || defined(__MORPHOS__)
+ {
+! # if defined(__GNUC__) && !defined(__MORPHOS__) && defined(__libnix__)
+ /* Have function (in libnix at least),
+ * but ain't got no prototype anywhere. */
+ extern unsigned long fdtofh(int filedescriptor);
+ # endif
++ # if !defined(__libnix__)
++ fflush(NULL);
++ # else
+ BPTR fh = (BPTR)fdtofh(mfp->mf_fd);
+
+ if (fh != 0)
+ Flush(fh);
++ # endif
+ }
+ # else /* assume Manx */
+ Flush(_devtab[mfp->mf_fd].fd);
+*** ../vim-7.0.109/src/version.c Fri Sep 15 20:17:49 2006
+--- src/version.c Tue Sep 26 13:48:48 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 110,
+ /**/
+
+--
+A fool must search for a greater fool to find admiration.
+
+ /// 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.0.111
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.111?rev=776&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.111 (added)
+++ trunk/packages/vim/upstream/patches/7.0.111 Tue Oct 3 16:04:08 2006
@@ -1,0 +1,336 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.111
+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.0.111
+Problem: The gzip plugin can't handle filenames with single quotes.
+Solution: Add and use the shellescape() function. (partly by Alexey Froloff)
+Files: runtime/autoload/gzip.vim, runtime/doc/eval.txt, src/eval.c,
+ src/mbyte.c, src/misc2.c, src/proto/misc2.pro
+
+
+*** ../vim-7.0.110/runtime/autoload/gzip.vim Tue Aug 8 19:55:06 2006
+--- runtime/autoload/gzip.vim Tue Oct 3 14:39:29 2006
+***************
+*** 1,6 ****
+ " Vim autoload file for editing compressed files.
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2006 Jul 19
+
+ " These functions are used by the gzip plugin.
+
+--- 1,6 ----
+ " Vim autoload file for editing compressed files.
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2006 Oct 03
+
+ " These functions are used by the gzip plugin.
+
+***************
+*** 68,76 ****
+ let tmp = tempname()
+ let tmpe = tmp . "." . expand("<afile>:e")
+ " write the just read lines to a temp file "'[,']w tmp.gz"
+! execute "silent '[,']w " . tmpe
+ " uncompress the temp file: call system("gzip -dn tmp.gz")
+! call system(a:cmd . " " . tmpe)
+ if !filereadable(tmp)
+ " uncompress didn't work! Keep the compressed file then.
+ echoerr "Error: Could not read uncompressed file"
+--- 68,76 ----
+ let tmp = tempname()
+ let tmpe = tmp . "." . expand("<afile>:e")
+ " write the just read lines to a temp file "'[,']w tmp.gz"
+! execute "silent '[,']w " . escape(tmpe, ' ')
+ " uncompress the temp file: call system("gzip -dn tmp.gz")
+! call system(a:cmd . " " . s:escape(tmpe))
+ if !filereadable(tmp)
+ " uncompress didn't work! Keep the compressed file then.
+ echoerr "Error: Could not read uncompressed file"
+***************
+*** 127,135 ****
+ let nmt = s:tempname(nm)
+ if rename(nm, nmt) == 0
+ if exists("b:gzip_comp_arg")
+! call system(a:cmd . " " . b:gzip_comp_arg . " '" . nmt . "'")
+ else
+! call system(a:cmd . " '" . nmt . "'")
+ endif
+ call rename(nmt . "." . expand("<afile>:e"), nm)
+ endif
+--- 127,135 ----
+ let nmt = s:tempname(nm)
+ if rename(nm, nmt) == 0
+ if exists("b:gzip_comp_arg")
+! call system(a:cmd . " " . b:gzip_comp_arg . " " . s:escape(nmt))
+ else
+! call system(a:cmd . " " . s:escape(nmt))
+ endif
+ call rename(nmt . "." . expand("<afile>:e"), nm)
+ endif
+***************
+*** 154,163 ****
+ if rename(nm, nmte) == 0
+ if &patchmode != "" && getfsize(nm . &patchmode) == -1
+ " Create patchmode file by creating the decompressed file new
+! call system(a:cmd . " -c " . nmte . " > " . nmt)
+ call rename(nmte, nm . &patchmode)
+ else
+! call system(a:cmd . " " . nmte)
+ endif
+ call rename(nmt, nm)
+ endif
+--- 154,163 ----
+ if rename(nm, nmte) == 0
+ if &patchmode != "" && getfsize(nm . &patchmode) == -1
+ " Create patchmode file by creating the decompressed file new
+! call system(a:cmd . " -c " . s:escape(nmte) . " > " . s:escape(nmt))
+ call rename(nmte, nm . &patchmode)
+ else
+! call system(a:cmd . " " . s:escape(nmte))
+ endif
+ call rename(nmt, nm)
+ endif
+***************
+*** 173,178 ****
+--- 173,186 ----
+ return fn
+ endif
+ return fnamemodify(a:name, ":p:h") . "/X~=@l9q5"
++ endfun
++
++ fun s:escape(name)
++ " shellescape() was added by patch 7.0.111
++ if v:version > 700 || (v:version == 700 && has('patch111'))
++ return shellescape(a:name)
++ endif
++ return "'" . a:name . "'"
+ endfun
+
+ " vim: set sw=2 :
+*** ../vim-7.0.110/runtime/doc/eval.txt Sun May 7 17:08:32 2006
+--- runtime/doc/eval.txt Fri Sep 22 19:43:18 2006
+***************
+*** 1,4 ****
+! *eval.txt* For Vim version 7.0. Last change: 2006 May 06
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+--- 1,4 ----
+! *eval.txt* For Vim version 7.0. Last change: 2006 Sep 22
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+***************
+*** 1709,1714 ****
+--- 1715,1722 ----
+ settabwinvar( {tabnr}, {winnr}, {varname}, {val}) set {varname} in window
+ {winnr} in tab page {tabnr} to {val}
+ setwinvar( {nr}, {varname}, {val}) set {varname} in window {nr} to {val}
++ shellescape( {string}) String escape {string} for use as shell
++ command argument
+ simplify( {filename}) String simplify filename as much as possible
+ sort( {list} [, {func}]) List sort {list}, using {func} to compare
+ soundfold( {word}) String sound-fold {word}
+***************
+*** 4434,4439 ****
+--- 4457,4477 ----
+ :call setwinvar(1, "&list", 0)
+ :call setwinvar(2, "myvar", "foobar")
+
++ shellescape({string}) *shellescape()*
++ Escape {string} for use as shell command argument.
++ On MS-Windows and MS-DOS, when 'shellslash' is not set, it
++ will enclose {string} double quotes and double all double
++ quotes within {string}.
++ For other systems, it will enclose {string} in single quotes
++ and replace all "'" with "'\''".
++ Example: >
++ :echo shellescape('c:\program files\vim')
++ < results in:
++ "c:\program files\vim" ~
++ Example usage: >
++ :call system("chmod +x -- " . shellescape(expand("%")))
++
++
+ simplify({filename}) *simplify()*
+ Simplify the file name as much as possible without changing
+ the meaning. Shortcuts (on MS-Windows) or symbolic links (on
+*** ../vim-7.0.110/src/eval.c Sat Sep 9 12:05:39 2006
+--- src/eval.c Thu Sep 14 17:44:41 2006
+***************
+*** 622,627 ****
+--- 622,628 ----
+ static void f_setreg __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_settabwinvar __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_setwinvar __ARGS((typval_T *argvars, typval_T *rettv));
++ static void f_shellescape __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_simplify __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_sort __ARGS((typval_T *argvars, typval_T *rettv));
+ static void f_soundfold __ARGS((typval_T *argvars, typval_T *rettv));
+***************
+*** 7146,7151 ****
+--- 7147,7153 ----
+ {"setreg", 2, 3, f_setreg},
+ {"settabwinvar", 4, 4, f_settabwinvar},
+ {"setwinvar", 3, 3, f_setwinvar},
++ {"shellescape", 1, 1, f_shellescape},
+ {"simplify", 1, 1, f_simplify},
+ {"sort", 1, 2, f_sort},
+ {"soundfold", 1, 1, f_soundfold},
+***************
+*** 14602,14607 ****
+--- 14604,14621 ----
+ }
+ #endif
+ }
++ }
++
++ /*
++ * "shellescape({string})" function
++ */
++ static void
++ f_shellescape(argvars, rettv)
++ typval_T *argvars;
++ typval_T *rettv;
++ {
++ rettv->vval.v_string = vim_strsave_shellescape(get_tv_string(&argvars[0]));
++ rettv->v_type = VAR_STRING;
+ }
+
+ /*
+*** ../vim-7.0.110/src/misc2.c Thu May 4 23:50:56 2006
+--- src/misc2.c Tue Sep 26 23:13:57 2006
+***************
+*** 1229,1234 ****
+--- 1229,1322 ----
+ return escaped_string;
+ }
+
++ #if defined(FEAT_EVAL) || defined(PROTO)
++ /*
++ * Escape "string" for use as a shell argument with system().
++ * This uses single quotes, except when we know we need to use double qoutes
++ * (MS-DOS and MS-Windows without 'shellslash' set).
++ * Returns the result in allocated memory, NULL if we have run out.
++ */
++ char_u *
++ vim_strsave_shellescape(string)
++ char_u *string;
++ {
++ unsigned length;
++ char_u *p;
++ char_u *d;
++ char_u *escaped_string;
++
++ /* First count the number of extra bytes required. */
++ length = STRLEN(string) + 3; /* two quotes and the trailing NUL */
++ for (p = string; *p != NUL; mb_ptr_adv(p))
++ {
++ # if defined(WIN32) || defined(WIN16) || defined(DOS)
++ if (!p_ssl)
++ {
++ if (*p == '"')
++ ++length; /* " -> "" */
++ }
++ else
++ # endif
++ if (*p == '\'')
++ length += 3; /* ' => '\'' */
++ }
++
++ /* Allocate memory for the result and fill it. */
++ escaped_string = alloc(length);
++ if (escaped_string != NULL)
++ {
++ d = escaped_string;
++
++ /* add opening quote */
++ # if defined(WIN32) || defined(WIN16) || defined(DOS)
++ if (!p_ssl)
++ *d++ = '"';
++ else
++ # endif
++ *d++ = '\'';
++
++ for (p = string; *p != NUL; )
++ {
++ # if defined(WIN32) || defined(WIN16) || defined(DOS)
++ if (!p_ssl)
++ {
++ if (*p == '"')
++ {
++ *d++ = '"';
++ *d++ = '"';
++ ++p;
++ continue;
++ }
++ }
++ else
++ # endif
++ if (*p == '\'')
++ {
++ *d++='\'';
++ *d++='\\';
++ *d++='\'';
++ *d++='\'';
++ ++p;
++ continue;
++ }
++
++ MB_COPY_CHAR(p, d);
++ }
++
++ /* add terminating quote and finish with a NUL */
++ # if defined(WIN32) || defined(WIN16) || defined(DOS)
++ if (!p_ssl)
++ *d++ = '"';
++ else
++ # endif
++ *d++ = '\'';
++ *d = NUL;
++ }
++
++ return escaped_string;
++ }
++ #endif
++
+ /*
+ * Like vim_strsave(), but make all characters uppercase.
+ * This uses ASCII lower-to-upper case translation, language independent.
+*** ../vim-7.0.110/src/proto/misc2.pro Fri Mar 24 23:42:55 2006
+--- src/proto/misc2.pro Thu Sep 14 18:28:43 2006
+***************
+*** 29,34 ****
+--- 29,35 ----
+ extern char_u *vim_strnsave __ARGS((char_u *string, int len));
+ extern char_u *vim_strsave_escaped __ARGS((char_u *string, char_u *esc_chars));
+ extern char_u *vim_strsave_escaped_ext __ARGS((char_u *string, char_u *esc_chars, int cc, int bsl));
++ extern char_u *vim_strsave_shellescape __ARGS((char_u *string));
+ extern char_u *vim_strsave_up __ARGS((char_u *string));
+ extern char_u *vim_strnsave_up __ARGS((char_u *string, int len));
+ extern void vim_strup __ARGS((char_u *p));
+*** ../vim-7.0.110/src/version.c Tue Sep 26 13:49:41 2006
+--- src/version.c Tue Oct 3 14:36:40 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 111,
+ /**/
+
+--
+The only way the average employee can speak to an executive is by taking a
+second job as a golf caddie.
+ (Scott Adams - The Dilbert principle)
+
+ /// 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.0.112
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.112?rev=776&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.112 (added)
+++ trunk/packages/vim/upstream/patches/7.0.112 Tue Oct 3 16:04:08 2006
@@ -1,0 +1,108 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.112
+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.0.112
+Problem: Python interface does not work with Python 2.5.
+Solution: Change PyMem_DEL() to Py_DECREF(). (Sumner Hayes)
+Files: src/if_python.c
+
+
+*** ../vim-7.0.111/src/if_python.c Sun Apr 30 20:48:37 2006
+--- src/if_python.c Fri Sep 22 15:08:33 2006
+***************
+*** 1463,1469 ****
+ if (this->buf && this->buf != INVALID_BUFFER_VALUE)
+ this->buf->b_python_ref = NULL;
+
+! PyMem_DEL(self);
+ }
+
+ static PyObject *
+--- 1463,1469 ----
+ if (this->buf && this->buf != INVALID_BUFFER_VALUE)
+ this->buf->b_python_ref = NULL;
+
+! Py_DECREF(self);
+ }
+
+ static PyObject *
+***************
+*** 1674,1680 ****
+ bufr = (BufferObject *)BufferNew(buf);
+ if (bufr == NULL)
+ {
+! PyMem_DEL(self);
+ return NULL;
+ }
+ Py_INCREF(bufr);
+--- 1674,1680 ----
+ bufr = (BufferObject *)BufferNew(buf);
+ if (bufr == NULL)
+ {
+! Py_DECREF(self);
+ return NULL;
+ }
+ Py_INCREF(bufr);
+***************
+*** 1690,1696 ****
+ RangeDestructor(PyObject *self)
+ {
+ Py_DECREF(((RangeObject *)(self))->buf);
+! PyMem_DEL(self);
+ }
+
+ static PyObject *
+--- 1690,1696 ----
+ RangeDestructor(PyObject *self)
+ {
+ Py_DECREF(((RangeObject *)(self))->buf);
+! Py_DECREF(self);
+ }
+
+ static PyObject *
+***************
+*** 1944,1950 ****
+ if (this->win && this->win != INVALID_WINDOW_VALUE)
+ this->win->w_python_ref = NULL;
+
+! PyMem_DEL(self);
+ }
+
+ static int
+--- 1944,1950 ----
+ if (this->win && this->win != INVALID_WINDOW_VALUE)
+ this->win->w_python_ref = NULL;
+
+! Py_DECREF(self);
+ }
+
+ static int
+*** ../vim-7.0.111/src/version.c Tue Oct 3 14:43:31 2006
+--- src/version.c Tue Oct 3 14:46:10 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 112,
+ /**/
+
+--
+A salesperson says: Translation:
+"backward compatible" Old technology
+"Premium" Overpriced
+"Can't keep it on the shelf" Unavailable
+"Stands alone" Piece of shit
+"Proprietary" Incompatible
+ (Scott Adams - The Dilbert principle)
+
+ /// 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.0.113
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.113?rev=776&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.113 (added)
+++ trunk/packages/vim/upstream/patches/7.0.113 Tue Oct 3 16:04:08 2006
@@ -1,0 +1,57 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.113
+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.0.113
+Problem: Using CTRL-L in Insert completion when there is no current match
+ may cause a crash. (Yukihiro Nakadaira)
+Solution: Check for compl_leader to be NULL
+Files: src/edit.c
+
+
+*** ../vim-7.0.112/src/edit.c Thu Sep 14 11:07:08 2006
+--- src/edit.c Tue Oct 3 14:57:47 2006
+***************
+*** 3206,3212 ****
+ for (cp = compl_shown_match->cp_next; cp != NULL
+ && cp != compl_first_match; cp = cp->cp_next)
+ {
+! if (ins_compl_equal(cp, compl_leader,
+ (int)STRLEN(compl_leader)))
+ {
+ p = cp->cp_str;
+--- 3206,3213 ----
+ for (cp = compl_shown_match->cp_next; cp != NULL
+ && cp != compl_first_match; cp = cp->cp_next)
+ {
+! if (compl_leader == NULL
+! || ins_compl_equal(cp, compl_leader,
+ (int)STRLEN(compl_leader)))
+ {
+ p = cp->cp_str;
+*** ../vim-7.0.112/src/version.c Tue Oct 3 15:02:11 2006
+--- src/version.c Tue Oct 3 15:20:13 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 113,
+ /**/
+
+--
+I recommend ordering large cargo containers of paper towels to make up
+whatever budget underruns you have. Paper products are always useful and they
+have the advantage of being completely flushable if you need to make room in
+the storage area later.
+ (Scott Adams - The Dilbert principle)
+
+ /// 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.0.114
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.114?rev=776&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.114 (added)
+++ trunk/packages/vim/upstream/patches/7.0.114 Tue Oct 3 16:04:08 2006
@@ -1,0 +1,64 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.114
+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.0.114
+Problem: When aborting an insert with CTRL-C an extra undo point is
+ created in the GUI. (Yukihiro Nakadaira)
+Solution: Call gotchars() only when advancing.
+Files: src/getchar.c
+
+
+*** ../vim-7.0.113/src/getchar.c Tue Sep 5 12:57:14 2006
+--- src/getchar.c Tue Sep 26 17:44:45 2006
+***************
+*** 1960,1969 ****
+ c = Ctrl_C;
+ flush_buffers(TRUE); /* flush all typeahead */
+
+! /* Also record this character, it might be needed to
+! * get out of Insert mode. */
+! *typebuf.tb_buf = c;
+! gotchars(typebuf.tb_buf, 1);
+ cmd_silent = FALSE;
+
+ break;
+--- 1962,1974 ----
+ c = Ctrl_C;
+ flush_buffers(TRUE); /* flush all typeahead */
+
+! if (advance)
+! {
+! /* Also record this character, it might be needed to
+! * get out of Insert mode. */
+! *typebuf.tb_buf = c;
+! gotchars(typebuf.tb_buf, 1);
+! }
+ cmd_silent = FALSE;
+
+ break;
+*** ../vim-7.0.113/src/version.c Tue Oct 3 15:22:00 2006
+--- src/version.c Tue Oct 3 15:34:14 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 114,
+ /**/
+
+--
+Sometimes you can protect millions of dollars in your budget simply by buying
+a bag of cookies, dropping it on the budget anylyst's desk, and saying
+something deeply personal such as "How was your weekend, big guy?"
+ (Scott Adams - The Dilbert principle)
+
+ /// 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.0.115
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.115?rev=776&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.115 (added)
+++ trunk/packages/vim/upstream/patches/7.0.115 Tue Oct 3 16:04:08 2006
@@ -1,0 +1,75 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.115
+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.0.115
+Problem: When 'ignorecase' is set, Insert mode completion only adds "foo"
+ and not "Foo" when both are found.
+ A found match isn't displayed right away when 'completeopt' does
+ not have "menu" or "menuone".
+Solution: Do not ignore case when checking if a completion match already
+ exists. call ins_compl_check_keys() also when not using a popup
+ menu. (Yukihiro Nakadaira)
+Files: src/edit.c
+
+
+*** ../vim-7.0.114/src/edit.c Tue Oct 3 15:22:00 2006
+--- src/edit.c Tue Oct 3 14:57:47 2006
+***************
+*** 2157,2163 ****
+ do
+ {
+ if ( !(match->cp_flags & ORIGINAL_TEXT)
+! && ins_compl_equal(match, str, len)
+ && match->cp_str[len] == NUL)
+ return NOTDONE;
+ match = match->cp_next;
+--- 2157,2163 ----
+ do
+ {
+ if ( !(match->cp_flags & ORIGINAL_TEXT)
+! && STRNCMP(match->cp_str, str, len) == 0
+ && match->cp_str[len] == NUL)
+ return NOTDONE;
+ match = match->cp_next;
+***************
+*** 4042,4048 ****
+ if (got_int)
+ break;
+ /* Fill the popup menu as soon as possible. */
+! if (pum_wanted() && type != -1)
+ ins_compl_check_keys(0);
+
+ if ((ctrl_x_mode != 0 && ctrl_x_mode != CTRL_X_WHOLE_LINE)
+--- 4042,4048 ----
+ if (got_int)
+ break;
+ /* Fill the popup menu as soon as possible. */
+! if (type != -1)
+ ins_compl_check_keys(0);
+
+ if ((ctrl_x_mode != 0 && ctrl_x_mode != CTRL_X_WHOLE_LINE)
+*** ../vim-7.0.114/src/version.c Tue Oct 3 15:36:09 2006
+--- src/version.c Tue Oct 3 15:46:15 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 115,
+ /**/
+
+--
+The budget process was invented by an alien race of sadistic beings who
+resemble large cats.
+ (Scott Adams - The Dilbert principle)
+
+ /// 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.0.116
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.116?rev=776&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.116 (added)
+++ trunk/packages/vim/upstream/patches/7.0.116 Tue Oct 3 16:04:08 2006
@@ -1,0 +1,49 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.116
+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.0.116
+Problem: 64 bit Windows version reports "32 bit" in the ":version" output.
+ (M. Veerman)
+Solution: Change the text for Win64.
+Files: src/version.c
+
+
+*** ../vim-7.0.115/src/version.c Tue Oct 3 15:49:20 2006
+--- src/version.c Tue Oct 3 16:29:31 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 116,
+ /**/
+***************
+*** 962,966 ****
+--- 964,972 ----
+ MSG_PUTS(_("\nMS-Windows 16/32 bit GUI version"));
+ # else
++ # ifdef _WIN64
++ MSG_PUTS(_("\nMS-Windows 64 bit GUI version"));
++ # else
+ MSG_PUTS(_("\nMS-Windows 32 bit GUI version"));
++ # endif
+ # endif
+ if (gui_is_win32s())
+
+--
+Article in the first Free Software Magazine: "Bram Moolenaar studied electrical
+engineering at the Technical University of Delft and graduated in 1985 on a
+multi-processor Unix architecture."
+Response by "dimator": Could the school not afford a proper stage for the
+ceremony?
+
+ /// 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.0.117
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.117?rev=776&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.117 (added)
+++ trunk/packages/vim/upstream/patches/7.0.117 Tue Oct 3 16:04:08 2006
@@ -1,0 +1,166 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.117
+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.0.117
+Problem: Using "extend" on a syntax item inside a region with "keepend", an
+ intermediate item may be truncated.
+ When applying the "keepend" and there is an offset to the end
+ pattern the highlighting of a contained item isn't adjusted.
+Solution: Use the seen_keepend flag to remember when to apply the "keepend"
+ flag. Adjust the keepend highlighting properly. (Ilya Bobir)
+Files: src/syntax.c
+
+
+*** ../vim-7.0.116/src/syntax.c Thu Apr 27 01:58:59 2006
+--- src/syntax.c Tue Oct 3 17:00:44 2006
+***************
+*** 977,982 ****
+--- 977,983 ----
+ {
+ stateitem_T *cur_si;
+ int i;
++ int seen_keepend;
+
+ if (startofline)
+ {
+***************
+*** 1002,1008 ****
+ /*
+ * Need to update the end of a start/skip/end that continues from the
+ * previous line. And regions that have "keepend", because they may
+! * influence contained items.
+ * Then check for items ending in column 0.
+ */
+ i = current_state.ga_len - 1;
+--- 1003,1012 ----
+ /*
+ * Need to update the end of a start/skip/end that continues from the
+ * previous line. And regions that have "keepend", because they may
+! * influence contained items. If we've just removed "extend"
+! * (startofline == 0) then we should update ends of normal regions
+! * contained inside "keepend" because "extend" could have extended
+! * these "keepend" regions as well as contained normal regions.
+ * Then check for items ending in column 0.
+ */
+ i = current_state.ga_len - 1;
+***************
+*** 1010,1019 ****
+--- 1014,1026 ----
+ for ( ; i > keepend_level; --i)
+ if (CUR_STATE(i).si_flags & HL_EXTEND)
+ break;
++
++ seen_keepend = FALSE;
+ for ( ; i < current_state.ga_len; ++i)
+ {
+ cur_si = &CUR_STATE(i);
+ if ((cur_si->si_flags & HL_KEEPEND)
++ || (seen_keepend && !startofline)
+ || (i == current_state.ga_len - 1 && startofline))
+ {
+ cur_si->si_h_startpos.col = 0; /* start highl. in col 0 */
+***************
+*** 1021,1026 ****
+--- 1028,1036 ----
+
+ if (!(cur_si->si_flags & HL_MATCHCONT))
+ update_si_end(cur_si, (int)current_col, !startofline);
++
++ if (!startofline && (cur_si->si_flags & HL_KEEPEND))
++ seen_keepend = TRUE;
+ }
+ }
+ check_keepend();
+***************
+*** 2564,2569 ****
+--- 2574,2580 ----
+ {
+ int i;
+ lpos_T maxpos;
++ lpos_T maxpos_h;
+ stateitem_T *sip;
+
+ /*
+***************
+*** 2583,2605 ****
+ break;
+
+ maxpos.lnum = 0;
+ for ( ; i < current_state.ga_len; ++i)
+ {
+ sip = &CUR_STATE(i);
+ if (maxpos.lnum != 0)
+ {
+ limit_pos_zero(&sip->si_m_endpos, &maxpos);
+! limit_pos_zero(&sip->si_h_endpos, &maxpos);
+ limit_pos_zero(&sip->si_eoe_pos, &maxpos);
+ sip->si_ends = TRUE;
+ }
+! if (sip->si_ends
+! && (sip->si_flags & HL_KEEPEND)
+! && (maxpos.lnum == 0
+ || maxpos.lnum > sip->si_m_endpos.lnum
+ || (maxpos.lnum == sip->si_m_endpos.lnum
+! && maxpos.col > sip->si_m_endpos.col)))
+! maxpos = sip->si_m_endpos;
+ }
+ }
+
+--- 2594,2623 ----
+ break;
+
+ maxpos.lnum = 0;
++ maxpos_h.lnum = 0;
+ for ( ; i < current_state.ga_len; ++i)
+ {
+ sip = &CUR_STATE(i);
+ if (maxpos.lnum != 0)
+ {
+ limit_pos_zero(&sip->si_m_endpos, &maxpos);
+! limit_pos_zero(&sip->si_h_endpos, &maxpos_h);
+ limit_pos_zero(&sip->si_eoe_pos, &maxpos);
+ sip->si_ends = TRUE;
+ }
+! if (sip->si_ends && (sip->si_flags & HL_KEEPEND))
+! {
+! if (maxpos.lnum == 0
+ || maxpos.lnum > sip->si_m_endpos.lnum
+ || (maxpos.lnum == sip->si_m_endpos.lnum
+! && maxpos.col > sip->si_m_endpos.col))
+! maxpos = sip->si_m_endpos;
+! if (maxpos_h.lnum == 0
+! || maxpos_h.lnum > sip->si_h_endpos.lnum
+! || (maxpos_h.lnum == sip->si_h_endpos.lnum
+! && maxpos_h.col > sip->si_h_endpos.col))
+! maxpos_h = sip->si_h_endpos;
+! }
+ }
+ }
+
+*** ../vim-7.0.116/src/version.c Tue Oct 3 16:30:40 2006
+--- src/version.c Tue Oct 3 16:59:50 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 117,
+ /**/
+
+--
+For humans, honesty is a matter of degree. Engineers are always honest in
+matters of technology and human relationships. That's why it's a good idea
+to keep engineers away from customers, romantic interests, and other people
+who can't handle the truth.
+ (Scott Adams - The Dilbert principle)
+
+ /// 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.0.118
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.118?rev=776&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.118 (added)
+++ trunk/packages/vim/upstream/patches/7.0.118 Tue Oct 3 16:04:08 2006
@@ -1,0 +1,49 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.118
+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.0.118
+Problem: printf() does not do zero padding for strings.
+Solution: Do allow zero padding for strings.
+Files: src/message.c
+
+
+*** ../vim-7.0.117/src/message.c Sun Sep 3 16:39:51 2006
+--- src/message.c Tue Oct 3 15:41:44 2006
+***************
+*** 4124,4131 ****
+ case 'c':
+ case 's':
+ length_modifier = '\0';
+- zero_padding = 0; /* turn zero padding off for string
+- conversions */
+ str_arg_l = 1;
+ switch (fmt_spec)
+ {
+--- 4124,4129 ----
+*** ../vim-7.0.117/src/version.c Tue Oct 3 17:04:21 2006
+--- src/version.c Tue Oct 3 17:20:11 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 118,
+ /**/
+
+--
+While it's true that many normal people whould prefer not to _date_ an
+engineer, most normal people harbor an intense desire to _mate_ with them,
+thus producing engineerlike children who will have high-paying jobs long
+before losing their virginity.
+ (Scott Adams - The Dilbert principle)
+
+ /// 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