r156 - in trunk/vim: debian upstream/patches
Norbert Tretkowski
nobse@costa.debian.org
Mon, 11 Apr 2005 10:09:39 +0000
Author: nobse
Date: 2005-04-11 10:09:37 +0000 (Mon, 11 Apr 2005)
New Revision: 156
Added:
trunk/vim/upstream/patches/6.3.069
trunk/vim/upstream/patches/6.3.070
trunk/vim/upstream/patches/6.3.071
Modified:
trunk/vim/debian/README
trunk/vim/debian/changelog
Log:
new upstream patches
Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README 2005-04-03 21:27:38 UTC (rev 155)
+++ trunk/vim/debian/README 2005-04-11 10:09:37 UTC (rev 156)
@@ -93,3 +93,6 @@
4728 6.3.066 permissions of backup file may be wrong
2200 6.3.067 (after 6.3.066) newly created file gets execute permission
2247 6.3.068 can't write when editing symbolic link to compressed file
+ 1710 6.3.069 when converting text with illegal characters Vim may crash
+ 1928 6.3.070 crash when 'number' set and with a vertical split
+ 1722 6.3.071 CTRL-X message sticks after error for completion
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-04-03 21:27:38 UTC (rev 155)
+++ trunk/vim/debian/changelog 2005-04-11 10:09:37 UTC (rev 156)
@@ -1,11 +1,13 @@
-vim (1:6.3-068+5) UNRELEASED; urgency=low
+vim (1:6.3-071+1) UNRELEASED; urgency=low
+ * New upstream patches (069 to 071), see README.gz for details.
+
* Norbert Tretkowski <nobse@debian.org>:
+ Re-add dh_installdirs to vim-variant part in debian/rules, so copying
the desktop file no longer fails. (closes: #302830)
+ Enabled backupcopy in global vimrc. (closes: #158657)
- -- Norbert Tretkowski <nobse@debian.org> Sun, 3 Apr 2005 23:27:23 +0200
+ -- Norbert Tretkowski <nobse@debian.org> Mon, 11 Apr 2005 12:08:49 +0200
vim (1:6.3-068+4) unstable; urgency=medium
Added: trunk/vim/upstream/patches/6.3.069
===================================================================
--- trunk/vim/upstream/patches/6.3.069 2005-04-03 21:27:38 UTC (rev 155)
+++ trunk/vim/upstream/patches/6.3.069 2005-04-11 10:09:37 UTC (rev 156)
@@ -0,0 +1,59 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.069
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.069
+Problem: When converting text with illegal characters Vim may crash.
+Solution: Avoid that too much is subtracted from the length. (Da Woon Jung)
+Files: src/mbyte.c
+
+
+*** ../vim-6.3.022/src/mbyte.c Thu Oct 7 20:07:59 2004
+--- src/mbyte.c Sat Mar 19 18:53:19 2005
+***************
+*** 3039,3045 ****
+ *to++ = '?';
+ if ((*mb_ptr2cells)((char_u *)from) > 1)
+ *to++ = '?';
+! l = (*mb_ptr2len_check)((char_u *)from);
+ from += l;
+ fromlen -= l;
+ }
+--- 3039,3052 ----
+ *to++ = '?';
+ if ((*mb_ptr2cells)((char_u *)from) > 1)
+ *to++ = '?';
+! if (enc_utf8)
+! l = utfc_ptr2len_check_len((char_u *)from, fromlen);
+! else
+! {
+! l = (*mb_ptr2len_check)((char_u *)from);
+! if (l > fromlen)
+! l = fromlen;
+! }
+ from += l;
+ fromlen -= l;
+ }
+*** ../vim-6.3.022/src/version.c Thu Mar 24 11:03:11 2005
+--- src/version.c Mon Apr 11 11:37:19 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+ { /* Add new patch number below this line */
++ /**/
++ 69,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+99. The hum of a cooling fan and the click of keys is comforting to you.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html ///
Added: trunk/vim/upstream/patches/6.3.070
===================================================================
--- trunk/vim/upstream/patches/6.3.070 2005-04-03 21:27:38 UTC (rev 155)
+++ trunk/vim/upstream/patches/6.3.070 2005-04-11 10:09:37 UTC (rev 156)
@@ -0,0 +1,71 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.070
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.070
+Problem: After ":set number linebreak wrap" and a vertical split, moving
+ the vertical separator far left will crash Vim. (Georg Dahn)
+Solution: Avoid dividing by zero.
+Files: src/charset.c
+
+
+*** ../vim-6.3.019/src/charset.c Wed Jun 9 14:56:26 2004
+--- src/charset.c Sun Apr 10 17:35:14 2005
+***************
+*** 1005,1010 ****
+--- 1005,1011 ----
+ int numberextra;
+ char_u *ps;
+ int tab_corr = (*s == TAB);
++ int n;
+
+ /*
+ * No 'linebreak' and 'showbreak': return quickly.
+***************
+*** 1048,1056 ****
+ col2 = col;
+ colmax = W_WIDTH(wp) - numberextra;
+ if (col >= colmax)
+! colmax += (((col - colmax)
+! / (colmax + win_col_off2(wp))) + 1)
+! * (colmax + win_col_off2(wp));
+ for (;;)
+ {
+ ps = s;
+--- 1049,1060 ----
+ col2 = col;
+ colmax = W_WIDTH(wp) - numberextra;
+ if (col >= colmax)
+! {
+! n = colmax + win_col_off2(wp);
+! if (n > 0)
+! colmax += (((col - colmax) / n) + 1) * n;
+! }
+!
+ for (;;)
+ {
+ ps = s;
+*** ../vim-6.3.019/src/version.c Mon Apr 11 11:38:29 2005
+--- src/version.c Mon Apr 11 11:40:47 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+ { /* Add new patch number below this line */
++ /**/
++ 70,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+100. The most exciting sporting events you noticed during summer 1996
+ was Netscape vs. Microsoft.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html ///
Added: trunk/vim/upstream/patches/6.3.071
===================================================================
--- trunk/vim/upstream/patches/6.3.071 2005-04-03 21:27:38 UTC (rev 155)
+++ trunk/vim/upstream/patches/6.3.071 2005-04-11 10:09:37 UTC (rev 156)
@@ -0,0 +1,56 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.071
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.071
+Problem: The message for CTRL-X mode is still displayed after an error for
+ 'thesaurus' or 'dictionary' being empty.
+Solution: Clear "edit_submode".
+Files: src/edit.c
+
+
+*** ../vim-6.3.020/src/edit.c Sat Jan 29 16:19:09 2005
+--- src/edit.c Fri Apr 8 11:16:31 2005
+***************
+*** 959,964 ****
+--- 959,965 ----
+ if (*curbuf->b_p_tsr == NUL && *p_tsr == NUL)
+ {
+ ctrl_x_mode = 0;
++ edit_submode = NULL;
+ msg_attr((char_u *)_("'thesaurus' option is empty"),
+ hl_attr(HLF_E));
+ if (emsg_silent == 0)
+***************
+*** 1163,1168 ****
+--- 1164,1170 ----
+ if (*curbuf->b_p_dict == NUL && *p_dict == NUL)
+ {
+ ctrl_x_mode = 0;
++ edit_submode = NULL;
+ msg_attr((char_u *)_("'dictionary' option is empty"),
+ hl_attr(HLF_E));
+ if (emsg_silent == 0)
+*** ../vim-6.3.020/src/version.c Mon Apr 11 11:49:54 2005
+--- src/version.c Mon Apr 11 11:51:26 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+ { /* Add new patch number below this line */
++ /**/
++ 71,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+101. U can read htis w/o ny porblm and cant figur eout Y its evn listd.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
+/// Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ Project leader for A-A-P -- http://www.A-A-P.org ///
+ \\\ Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html ///