r721 - in /trunk/packages/vim: debian/README debian/changelog
upstream/patches/7.0.019 upstream/patches/7.0.020 upstream/patches/7.0.021
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue Jun 20 17:45:08 UTC 2006
Author: jamessan
Date: Tue Jun 20 17:45:07 2006
New Revision: 721
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=721
Log:
Adds patches 019 - 021
Added:
trunk/packages/vim/upstream/patches/7.0.019
trunk/packages/vim/upstream/patches/7.0.020
trunk/packages/vim/upstream/patches/7.0.021
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=721&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Jun 20 17:45:07 2006
@@ -43,3 +43,6 @@
1810 7.0.016 recognize encodings "mac-roman", "dec-mcs" and "hp-roman8"
2302 7.0.017 (after 7.0.014) Motif: doesn't link with Motif 1.2 and earlier
1649 7.0.018 VMS: plugins are not loaded on startup
+ 1425 7.0.019 crash for "VjA789" and repeating
+ 1470 7.0.020 GUI: crash when using 'mousefocus'
+ 4240 7.0.021 crash when using "\\[" and "\\]" in 'errorformat
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=721&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Jun 20 17:45:07 2006
@@ -1,7 +1,7 @@
-vim (1:7.0-017+9) unstable; urgency=low
+vim (1:7.0-021+1) unstable; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patch (018), see README.gz for details.
+ * New upstream patches (018 - 021), see README.gz for details.
[ James Vega ]
* debian/control: Make Vim binNMUable.
Added: trunk/packages/vim/upstream/patches/7.0.019
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.019?rev=721&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.019 (added)
+++ trunk/packages/vim/upstream/patches/7.0.019 Tue Jun 20 17:45:07 2006
@@ -1,0 +1,46 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.019
+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.019
+Problem: Repeating "VjA789" may cause a crash. (James Vega)
+Solution: Check the cursor column after moving it to another line.
+Files: src/ops.c
+
+
+*** ../vim-7.0.018/src/ops.c Sun Apr 30 20:45:12 2006
+--- src/ops.c Tue Jun 20 12:49:46 2006
+***************
+*** 2413,2418 ****
+--- 2413,2419 ----
+ else
+ {
+ curwin->w_cursor = oap->end;
++ check_cursor_col();
+
+ /* Works just like an 'i'nsert on the next character. */
+ if (!lineempty(curwin->w_cursor.lnum)
+*** ../vim-7.0.018/src/version.c Mon Jun 19 10:56:20 2006
+--- src/version.c Tue Jun 20 12:55:10 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 19,
+ /**/
+
+--
+Two cows are standing together in a field. One asks the other:
+"So what do you think about this Mad Cow Disease?"
+The other replies: "That doesn't concern me. I'm a helicopter."
+
+ /// 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.020
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.020?rev=721&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.020 (added)
+++ trunk/packages/vim/upstream/patches/7.0.020 Tue Jun 20 17:45:07 2006
@@ -1,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.020
+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.020
+Problem: Crash when using 'mousefocus'. (William Fulton)
+Solution: Make buffer for mouse coordinates 2 bytes longer. (Juergen Weigert)
+Files: src/gui.c
+
+
+*** ../vim-7.0.019/src/gui.c Sat May 13 12:15:09 2006
+--- src/gui.c Tue Jun 20 16:27:02 2006
+***************
+*** 4515,4521 ****
+ int y;
+ {
+ win_T *wp;
+! char_u st[6];
+
+ /* Ignore this while still starting up. */
+ if (!gui.in_use || gui.starting)
+--- 4515,4521 ----
+ int y;
+ {
+ win_T *wp;
+! char_u st[8];
+
+ /* Ignore this while still starting up. */
+ if (!gui.in_use || gui.starting)
+*** ../vim-7.0.019/src/version.c Tue Jun 20 12:56:11 2006
+--- src/version.c Tue Jun 20 16:32:28 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 20,
+ /**/
+
+--
+Michael: There is no such thing as a dump question.
+Bernard: Sure there is. For example "what is a core dump?"
+
+ /// 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.021
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.021?rev=721&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.021 (added)
+++ trunk/packages/vim/upstream/patches/7.0.021 Tue Jun 20 17:45:07 2006
@@ -1,0 +1,139 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.021
+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.021
+Problem: Crash when using "\\[" and "\\]" in 'errorformat'. (Marc Weber)
+Solution: Check for valid submatches after matching the pattern.
+Files: src/quickfix.c
+
+
+*** ../vim-7.0.020/src/quickfix.c Wed May 3 23:23:30 2006
+--- src/quickfix.c Tue Jun 20 17:04:20 2006
+***************
+*** 602,614 ****
+ else
+ type = 0;
+ /*
+! * Extract error message data from matched line
+ */
+ if ((i = (int)fmt_ptr->addr[0]) > 0) /* %f */
+ {
+! int c = *regmatch.endp[i];
+
+ /* Expand ~/file and $HOME/file to full path. */
+ *regmatch.endp[i] = NUL;
+ expand_env(regmatch.startp[i], namebuf, CMDBUFFSIZE);
+ *regmatch.endp[i] = c;
+--- 602,620 ----
+ else
+ type = 0;
+ /*
+! * Extract error message data from matched line.
+! * We check for an actual submatch, because "\[" and "\]" in
+! * the 'errorformat' may cause the wrong submatch to be used.
+ */
+ if ((i = (int)fmt_ptr->addr[0]) > 0) /* %f */
+ {
+! int c;
+!
+! if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
+! continue;
+
+ /* Expand ~/file and $HOME/file to full path. */
++ c = *regmatch.endp[i];
+ *regmatch.endp[i] = NUL;
+ expand_env(regmatch.startp[i], namebuf, CMDBUFFSIZE);
+ *regmatch.endp[i] = c;
+***************
+*** 618,652 ****
+--- 624,686 ----
+ continue;
+ }
+ if ((i = (int)fmt_ptr->addr[1]) > 0) /* %n */
++ {
++ if (regmatch.startp[i] == NULL)
++ continue;
+ enr = (int)atol((char *)regmatch.startp[i]);
++ }
+ if ((i = (int)fmt_ptr->addr[2]) > 0) /* %l */
++ {
++ if (regmatch.startp[i] == NULL)
++ continue;
+ lnum = atol((char *)regmatch.startp[i]);
++ }
+ if ((i = (int)fmt_ptr->addr[3]) > 0) /* %c */
++ {
++ if (regmatch.startp[i] == NULL)
++ continue;
+ col = (int)atol((char *)regmatch.startp[i]);
++ }
+ if ((i = (int)fmt_ptr->addr[4]) > 0) /* %t */
++ {
++ if (regmatch.startp[i] == NULL)
++ continue;
+ type = *regmatch.startp[i];
++ }
+ if (fmt_ptr->flags == '+' && !multiscan) /* %+ */
+ STRCPY(errmsg, IObuff);
+ else if ((i = (int)fmt_ptr->addr[5]) > 0) /* %m */
+ {
++ if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
++ continue;
+ len = (int)(regmatch.endp[i] - regmatch.startp[i]);
+ vim_strncpy(errmsg, regmatch.startp[i], len);
+ }
+ if ((i = (int)fmt_ptr->addr[6]) > 0) /* %r */
++ {
++ if (regmatch.startp[i] == NULL)
++ continue;
+ tail = regmatch.startp[i];
++ }
+ if ((i = (int)fmt_ptr->addr[7]) > 0) /* %p */
+ {
++ if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
++ continue;
+ col = (int)(regmatch.endp[i] - regmatch.startp[i] + 1);
+ if (*((char_u *)regmatch.startp[i]) != TAB)
+ use_viscol = TRUE;
+ }
+ if ((i = (int)fmt_ptr->addr[8]) > 0) /* %v */
+ {
++ if (regmatch.startp[i] == NULL)
++ continue;
+ col = (int)atol((char *)regmatch.startp[i]);
+ use_viscol = TRUE;
+ }
+ if ((i = (int)fmt_ptr->addr[9]) > 0) /* %s */
+ {
++ if (regmatch.startp[i] == NULL || regmatch.endp[i] == NULL)
++ continue;
+ len = (int)(regmatch.endp[i] - regmatch.startp[i]);
+ if (len > CMDBUFFSIZE - 5)
+ len = CMDBUFFSIZE - 5;
+*** ../vim-7.0.020/src/version.c Tue Jun 20 16:33:21 2006
+--- src/version.c Tue Jun 20 17:07:25 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 21,
+ /**/
+
+--
+TALL KNIGHT: We are now no longer the Knights Who Say Ni!
+ONE KNIGHT: Ni!
+OTHERS: Sh!
+ONE KNIGHT: (whispers) Sorry.
+ "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 ///
More information about the pkg-vim-maintainers
mailing list