r1101 - in /trunk/packages/vim: debian/ patches/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Mon Dec 3 20:40:35 UTC 2007
Author: jamessan
Date: Mon Dec 3 20:40:34 2007
New Revision: 1101
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1101
Log:
* New upstream patches (139 - 167), see README.gz for details.
- 7.1.167 fixes a crash with large values for the -c option of xxd
(Closes: #452789)
Added:
trunk/packages/vim/upstream/patches/7.1.162
trunk/packages/vim/upstream/patches/7.1.163
trunk/packages/vim/upstream/patches/7.1.164
trunk/packages/vim/upstream/patches/7.1.165
trunk/packages/vim/upstream/patches/7.1.166
trunk/packages/vim/upstream/patches/7.1.167
Removed:
trunk/packages/vim/patches/xxd.c-large_columns.diff
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=1101&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Mon Dec 3 20:40:34 2007
@@ -190,3 +190,9 @@
1646 7.1.159 overlapping arguments for a strcpy()
1661 7.1.160 getting/losing focus may cause hit-enter prompt to be redrawn
4347 7.1.161 compilation errors with tiny features and EXITFREE
+ 4691 7.1.162 crash when using a modifier before "while" or "for"
+ 2367 7.1.163 warning for the unknown option 'bufsecret'
+ 1576 7.1.164 reading past end of regexp pattern
+ 5538 7.1.165 crash related to getting X window ID
+ 2134 7.1.166 memory leak when using "gp" in Visual mode
+ 2528 7.1.167 xxd crashes when using "xxd -b -c 110"
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1101&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Dec 3 20:40:34 2007
@@ -1,9 +1,11 @@
-vim (1:7.1-161+1) UNRELEASED; urgency=low
+vim (1:7.1-167+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (139 - 161), see README.gz for details.
+ * New upstream patches (139 - 167), see README.gz for details.
- 7.1.147 fixes a crash when tab completing a user's home directory.
(Closes: #453049)
+ - 7.1.167 fixes a crash with large values for the -c option of xxd
+ (Closes: #452789)
[ James Vega ]
* runtime/ftplugin/debchangelog.vim:
@@ -63,10 +65,8 @@
* debian/control:
- Remove Norbert Tretowski from Uploaders with his permission. Thanks for
all your work.
- * Add xxd.c-large_columns.diff, which fixes a segfault that occus in xxd
- when called with a large -c argument. (Closes: #452789)
-
- -- James Vega <jamessan at debian.org> Wed, 28 Nov 2007 11:00:36 -0500
+
+ -- James Vega <jamessan at debian.org> Mon, 03 Dec 2007 15:38:54 -0500
vim (1:7.1-138+1) unstable; urgency=medium
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1101&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Mon Dec 3 20:40:34 2007
@@ -26,4 +26,3 @@
lhaskell.vim-syntax.diff -p0
fstab.vim-syntax.diff -p0
filetype.vim-debfiles.diff -p0
-xxd.c-large_columns.diff -p0
Added: trunk/packages/vim/upstream/patches/7.1.162
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.162?rev=1101&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.162 (added)
+++ trunk/packages/vim/upstream/patches/7.1.162 Mon Dec 3 20:40:34 2007
@@ -1,0 +1,172 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.162
+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.162
+Problem: Crash when using a modifier before "while" or "for". (A.Politz)
+Solution: Skip modifiers when checking for a loop command.
+Files: src/proto/ex_docmd.pro, src/ex_docmd.c, src/ex_eval.c
+
+
+*** ../vim-7.1.161/src/proto/ex_docmd.pro Sun Sep 30 14:00:41 2007
+--- src/proto/ex_docmd.pro Sat Nov 24 16:34:06 2007
+***************
+*** 5,10 ****
+--- 5,11 ----
+ int getline_equal __ARGS((char_u *(*fgetline)(int, void *, int), void *cookie, char_u *(*func)(int, void *, int)));
+ void *getline_cookie __ARGS((char_u *(*fgetline)(int, void *, int), void *cookie));
+ int checkforcmd __ARGS((char_u **pp, char *cmd, int len));
++ int modifier_len __ARGS((char_u *cmd));
+ int cmd_exists __ARGS((char_u *name));
+ char_u *set_one_cmd_context __ARGS((expand_T *xp, char_u *buff));
+ char_u *skip_range __ARGS((char_u *cmd, int *ctx));
+*** ../vim-7.1.161/src/ex_docmd.c Tue Nov 20 12:30:31 2007
+--- src/ex_docmd.c Sat Nov 24 16:41:20 2007
+***************
+*** 2963,2968 ****
+--- 2963,3019 ----
+ #endif
+
+ #if defined(FEAT_EVAL) || defined(PROTO)
++ static struct cmdmod
++ {
++ char *name;
++ int minlen;
++ int has_count; /* :123verbose :3tab */
++ } cmdmods[] = {
++ {"aboveleft", 3, FALSE},
++ {"belowright", 3, FALSE},
++ {"botright", 2, FALSE},
++ {"browse", 3, FALSE},
++ {"confirm", 4, FALSE},
++ {"hide", 3, FALSE},
++ {"keepalt", 5, FALSE},
++ {"keepjumps", 5, FALSE},
++ {"keepmarks", 3, FALSE},
++ {"leftabove", 5, FALSE},
++ {"lockmarks", 3, FALSE},
++ {"rightbelow", 6, FALSE},
++ {"sandbox", 3, FALSE},
++ {"silent", 3, FALSE},
++ {"tab", 3, TRUE},
++ {"topleft", 2, FALSE},
++ {"verbose", 4, TRUE},
++ {"vertical", 4, FALSE},
++ };
++
++ /*
++ * Return length of a command modifier (including optional count).
++ * Return zero when it's not a modifier.
++ */
++ int
++ modifier_len(cmd)
++ char_u *cmd;
++ {
++ int i, j;
++ char_u *p = cmd;
++
++ if (VIM_ISDIGIT(*cmd))
++ p = skipwhite(skipdigits(cmd));
++ for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i)
++ {
++ for (j = 0; p[j] != NUL; ++j)
++ if (p[j] != cmdmods[i].name[j])
++ break;
++ if (!isalpha(p[j]) && j >= cmdmods[i].minlen
++ && (p == cmd || cmdmods[i].has_count))
++ return j + (p - cmd);
++ }
++ return 0;
++ }
++
+ /*
+ * Return > 0 if an Ex command "name" exists.
+ * Return 2 if there is an exact match.
+***************
+*** 2977,3006 ****
+ int i;
+ int j;
+ char_u *p;
+- static struct cmdmod
+- {
+- char *name;
+- int minlen;
+- } cmdmods[] = {
+- {"aboveleft", 3},
+- {"belowright", 3},
+- {"botright", 2},
+- {"browse", 3},
+- {"confirm", 4},
+- {"hide", 3},
+- {"keepalt", 5},
+- {"keepjumps", 5},
+- {"keepmarks", 3},
+- {"leftabove", 5},
+- {"lockmarks", 3},
+- {"rightbelow", 6},
+- {"sandbox", 3},
+- {"silent", 3},
+- {"tab", 3},
+- {"topleft", 2},
+- {"verbose", 4},
+- {"vertical", 4},
+- };
+
+ /* Check command modifiers. */
+ for (i = 0; i < sizeof(cmdmods) / sizeof(struct cmdmod); ++i)
+--- 3028,3033 ----
+*** ../vim-7.1.161/src/ex_eval.c Wed Aug 1 15:47:06 2007
+--- src/ex_eval.c Sat Nov 24 16:34:09 2007
+***************
+*** 2269,2277 ****
+ has_loop_cmd(p)
+ char_u *p;
+ {
+! p = skipwhite(p);
+! while (*p == ':')
+! p = skipwhite(p + 1);
+ if ((p[0] == 'w' && p[1] == 'h')
+ || (p[0] == 'f' && p[1] == 'o' && p[2] == 'r'))
+ return TRUE;
+--- 2269,2286 ----
+ has_loop_cmd(p)
+ char_u *p;
+ {
+! int len;
+!
+! /* skip modifiers, white space and ':' */
+! for (;;)
+! {
+! while (*p == ' ' || *p == '\t' || *p == ':')
+! ++p;
+! len = modifier_len(p);
+! if (len == 0)
+! break;
+! p += len;
+! }
+ if ((p[0] == 'w' && p[1] == 'h')
+ || (p[0] == 'f' && p[1] == 'o' && p[2] == 'r'))
+ return TRUE;
+*** ../vim-7.1.161/src/version.c Sat Nov 24 21:27:33 2007
+--- src/version.c Sat Nov 24 21:48:38 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 162,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+144. You eagerly await the update of the "Cool Site of the Day."
+
+ /// 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.163
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.163?rev=1101&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.163 (added)
+++ trunk/packages/vim/upstream/patches/7.1.163 Mon Dec 3 20:40:34 2007
@@ -1,0 +1,72 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.163
+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.163
+Problem: Warning for the unknown option 'bufsecret'.
+Solution: Remove the lines .vim that use this option. (Andy Wokula)
+Files: runtime/menu.vim
+
+
+*** ../vim-7.1.162/runtime/menu.vim Sun May 6 15:21:23 2007
+--- runtime/menu.vim Mon Nov 19 23:17:11 2007
+***************
+*** 2,8 ****
+ " You can also use this as a start for your own set of menus.
+ "
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2007 Jan 09
+
+ " Note that ":an" (short for ":anoremenu") is often used to make a menu work
+ " in all modes and avoid side effects from mappings defined by the user.
+--- 2,8 ----
+ " You can also use this as a start for your own set of menus.
+ "
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2007 Nov 19
+
+ " Note that ":an" (short for ":anoremenu") is often used to make a menu work
+ " in all modes and avoid side effects from mappings defined by the user.
+***************
+*** 658,664 ****
+ let buf = 1
+ while buf <= bufnr('$')
+ if bufexists(buf) && !isdirectory(bufname(buf)) && buflisted(buf)
+- \ && !getbufvar(buf, "&bufsecret")
+ let s:bmenu_count = s:bmenu_count + 1
+ endif
+ let buf = buf + 1
+--- 658,663 ----
+***************
+*** 671,677 ****
+ let buf = 1
+ while buf <= bufnr('$')
+ if bufexists(buf) && !isdirectory(bufname(buf)) && buflisted(buf)
+- \ && !getbufvar(buf, "&bufsecret")
+ call <SID>BMFilename(bufname(buf), buf)
+ endif
+ let buf = buf + 1
+--- 670,675 ----
+*** ../vim-7.1.162/src/version.c Sat Nov 24 21:49:19 2007
+--- src/version.c Thu Nov 29 17:44:08 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 163,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+158. You get a tuner card so you can watch TV while surfing.
+
+ /// 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.164
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.164?rev=1101&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.164 (added)
+++ trunk/packages/vim/upstream/patches/7.1.164 Mon Dec 3 20:40:34 2007
@@ -1,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.164
+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.164
+Problem: Reading past end of regexp pattern. (Dominique Pelle)
+Solution: Use utf_ptr2len().
+Files: src/regexp.c
+
+
+*** ../vim-7.1.163/src/regexp.c Sat Aug 11 13:57:31 2007
+--- src/regexp.c Sat Nov 24 13:23:53 2007
+***************
+*** 2770,2776 ****
+ {
+ #ifdef FEAT_MBYTE
+ if (enc_utf8)
+! prevchr_len += utf_char2len(mb_ptr2char(regparse + prevchr_len));
+ else if (has_mbyte)
+ prevchr_len += (*mb_ptr2len)(regparse + prevchr_len);
+ else
+--- 2770,2777 ----
+ {
+ #ifdef FEAT_MBYTE
+ if (enc_utf8)
+! /* exclude composing chars that mb_ptr2len does include */
+! prevchr_len += utf_ptr2len(regparse + prevchr_len);
+ else if (has_mbyte)
+ prevchr_len += (*mb_ptr2len)(regparse + prevchr_len);
+ else
+*** ../vim-7.1.163/src/version.c Thu Nov 29 17:46:01 2007
+--- src/version.c Thu Nov 29 21:25:45 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 164,
+ /**/
+
+--
+Send $25.00 for handy leaflet on how to make money by selling leaflets
+
+ /// 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.165
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.165?rev=1101&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.165 (added)
+++ trunk/packages/vim/upstream/patches/7.1.165 Mon Dec 3 20:40:34 2007
@@ -1,0 +1,177 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.165
+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.165
+Problem: Crash related to getting X window ID. (Dominique Pelle)
+Solution: Don't trust the window ID that we got in the past, check it every
+ time.
+Files: src/os_unix.c
+
+
+*** ../vim-7.1.164/src/os_unix.c Thu Aug 30 11:46:46 2007
+--- src/os_unix.c Thu Nov 29 18:19:56 2007
+***************
+*** 310,316 ****
+ }
+
+ /*
+! * mch_inchar(): low level input funcion.
+ * Get a characters from the keyboard.
+ * Return the number of characters that are available.
+ * If wtime == 0 do not wait for characters.
+--- 310,316 ----
+ }
+
+ /*
+! * mch_inchar(): low level input function.
+ * Get a characters from the keyboard.
+ * Return the number of characters that are available.
+ * If wtime == 0 do not wait for characters.
+***************
+*** 1567,1584 ****
+ #ifdef FEAT_XCLIPBOARD
+ if (xterm_dpy != NULL && x11_window != 0)
+ {
+! /* Checked it already. */
+! if (x11_display_from == XD_XTERM)
+! return OK;
+!
+! /*
+! * If the X11 display was opened here before, for the window where Vim
+! * was started, close that one now to avoid a memory leak.
+! */
+! if (x11_display_from == XD_HERE && x11_display != NULL)
+! XCloseDisplay(x11_display);
+! x11_display = xterm_dpy;
+! x11_display_from = XD_XTERM;
+ if (test_x11_window(x11_display) == FAIL)
+ {
+ /* probably bad $WINDOWID */
+--- 1567,1585 ----
+ #ifdef FEAT_XCLIPBOARD
+ if (xterm_dpy != NULL && x11_window != 0)
+ {
+! /* We may have checked it already, but Gnome terminal can move us to
+! * another window, so we need to check every time. */
+! if (x11_display_from != XD_XTERM)
+! {
+! /*
+! * If the X11 display was opened here before, for the window where
+! * Vim was started, close that one now to avoid a memory leak.
+! */
+! if (x11_display_from == XD_HERE && x11_display != NULL)
+! XCloseDisplay(x11_display);
+! x11_display = xterm_dpy;
+! x11_display_from = XD_XTERM;
+! }
+ if (test_x11_window(x11_display) == FAIL)
+ {
+ /* probably bad $WINDOWID */
+***************
+*** 2421,2427 ****
+ /*
+ * Set the case of the file name, if it already exists. This will cause the
+ * file name to remain exactly the same.
+! * Only required for file systems where case is ingored and preserved.
+ */
+ /*ARGSUSED*/
+ void
+--- 2422,2428 ----
+ /*
+ * Set the case of the file name, if it already exists. This will cause the
+ * file name to remain exactly the same.
+! * Only required for file systems where case is ignored and preserved.
+ */
+ /*ARGSUSED*/
+ void
+***************
+*** 4653,4659 ****
+ ret = poll(fds, nfd, towait);
+ # ifdef FEAT_MZSCHEME
+ if (ret == 0 && mzquantum_used)
+! /* MzThreads scheduling is required and timeout occured */
+ finished = FALSE;
+ # endif
+
+--- 4654,4660 ----
+ ret = poll(fds, nfd, towait);
+ # ifdef FEAT_MZSCHEME
+ if (ret == 0 && mzquantum_used)
+! /* MzThreads scheduling is required and timeout occurred */
+ finished = FALSE;
+ # endif
+
+***************
+*** 4801,4807 ****
+ #endif
+ # ifdef FEAT_MZSCHEME
+ if (ret == 0 && mzquantum_used)
+! /* loop if MzThreads must be scheduled and timeout occured */
+ finished = FALSE;
+ # endif
+
+--- 4802,4808 ----
+ #endif
+ # ifdef FEAT_MZSCHEME
+ if (ret == 0 && mzquantum_used)
+! /* loop if MzThreads must be scheduled and timeout occurred */
+ finished = FALSE;
+ # endif
+
+***************
+*** 5191,5197 ****
+ {
+ /* When using system() always add extra quotes, because the shell
+ * is started twice. Otherwise put a backslash before special
+! * characters, except insice ``. */
+ #ifdef USE_SYSTEM
+ STRCAT(command, " \"");
+ STRCAT(command, pat[i]);
+--- 5192,5198 ----
+ {
+ /* When using system() always add extra quotes, because the shell
+ * is started twice. Otherwise put a backslash before special
+! * characters, except inside ``. */
+ #ifdef USE_SYSTEM
+ STRCAT(command, " \"");
+ STRCAT(command, pat[i]);
+***************
+*** 5675,5681 ****
+ /* gpm library tries to handling TSTP causes
+ * problems. Anyways, we close connection to Gpm whenever
+ * we are going to suspend or starting an external process
+! * so we should'nt have problem with this
+ */
+ signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
+ return 1; /* succeed */
+--- 5676,5682 ----
+ /* gpm library tries to handling TSTP causes
+ * problems. Anyways, we close connection to Gpm whenever
+ * we are going to suspend or starting an external process
+! * so we shouldn't have problem with this
+ */
+ signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
+ return 1; /* succeed */
+*** ../vim-7.1.164/src/version.c Thu Nov 29 21:26:38 2007
+--- src/version.c Sat Dec 1 17:17:20 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 165,
+ /**/
+
+--
+"Hit any key to continue" is very confusing when you have two keyboards.
+
+ /// 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.166
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.166?rev=1101&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.166 (added)
+++ trunk/packages/vim/upstream/patches/7.1.166 Mon Dec 3 20:40:34 2007
@@ -1,0 +1,80 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.166
+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.166
+Problem: Memory leak for using "gp" in Visual mode.
+Solution: Free memory in put_register(). (Dominique Pelle)
+Files: src/ops.c
+
+
+*** ../vim-7.1.165/src/ops.c Thu Nov 8 10:35:02 2007
+--- src/ops.c Sun Nov 25 15:17:43 2007
+***************
+*** 927,934 ****
+ int name;
+ int copy; /* make a copy, if FALSE make register empty. */
+ {
+! static struct yankreg *reg;
+! int i;
+
+ #ifdef FEAT_CLIPBOARD
+ /* When Visual area changed, may have to update selection. Obtain the
+--- 927,934 ----
+ int name;
+ int copy; /* make a copy, if FALSE make register empty. */
+ {
+! struct yankreg *reg;
+! int i;
+
+ #ifdef FEAT_CLIPBOARD
+ /* When Visual area changed, may have to update selection. Obtain the
+***************
+*** 967,973 ****
+ }
+
+ /*
+! * Put "reg" into register "name". Free any previous contents.
+ */
+ void
+ put_register(name, reg)
+--- 967,973 ----
+ }
+
+ /*
+! * Put "reg" into register "name". Free any previous contents and "reg".
+ */
+ void
+ put_register(name, reg)
+***************
+*** 977,982 ****
+--- 977,983 ----
+ get_yank_register(name, 0);
+ free_yank_all();
+ *y_current = *(struct yankreg *)reg;
++ vim_free(reg);
+
+ # ifdef FEAT_CLIPBOARD
+ /* Send text written to clipboard register to the clipboard. */
+*** ../vim-7.1.165/src/version.c Sat Dec 1 17:18:45 2007
+--- src/version.c Sat Dec 1 21:11:25 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 166,
+ /**/
+
+--
+An error has occurred. Hit any user to continue.
+
+ /// 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.167
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.167?rev=1101&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.167 (added)
+++ trunk/packages/vim/upstream/patches/7.1.167 Mon Dec 3 20:40:34 2007
@@ -1,0 +1,80 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.167
+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.167
+Problem: Xxd crashes when using "xxd -b -c 110". (Debian bug 452789)
+Solution: Allocate more memory. Fix check for maximum number of columns.
+Files: src/xxd/xxd.c
+
+
+*** ../vim-7.1.166/src/xxd/xxd.c Thu May 10 19:07:42 2007
+--- src/xxd/xxd.c Thu Nov 29 21:05:16 2007
+***************
+*** 212,218 ****
+
+ #define TRY_SEEK /* attempt to use lseek, or skip forward by reading */
+ #define COLS 256 /* change here, if you ever need more columns */
+! #define LLEN (9 + (5*COLS-1)/2 + 2 + COLS)
+
+ char hexxa[] = "0123456789abcdef0123456789ABCDEF", *hexx = hexxa;
+
+--- 212,218 ----
+
+ #define TRY_SEEK /* attempt to use lseek, or skip forward by reading */
+ #define COLS 256 /* change here, if you ever need more columns */
+! #define LLEN (11 + (9*COLS-1)/1 + COLS + 2)
+
+ char hexxa[] = "0123456789abcdef0123456789ABCDEF", *hexx = hexxa;
+
+***************
+*** 590,596 ****
+ default: octspergrp = 0; break;
+ }
+
+! if (cols < 1 || (!hextype && (cols > COLS)))
+ {
+ fprintf(stderr, "%s: invalid number of columns (max. %d).\n", pname, COLS);
+ exit(1);
+--- 590,597 ----
+ default: octspergrp = 0; break;
+ }
+
+! if (cols < 1 || ((hextype == HEX_NORMAL || hextype == HEX_BITS)
+! && (cols > COLS)))
+ {
+ fprintf(stderr, "%s: invalid number of columns (max. %d).\n", pname, COLS);
+ exit(1);
+***************
+*** 750,755 ****
+--- 751,757 ----
+ }
+ if (ebcdic)
+ e = (e < 64) ? '.' : etoa64[e-64];
++ /* When changing this update definition of LLEN above. */
+ l[11 + (grplen * cols - 1)/octspergrp + p] =
+ #ifdef __MVS__
+ (e >= 64)
+*** ../vim-7.1.166/src/version.c Sat Dec 1 21:12:23 2007
+--- src/version.c Mon Dec 3 21:30:31 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 167,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+178. You look for an icon to double-click to open your bedroom window.
+
+ /// 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