r734 - in /trunk/packages/vim: debian/README debian/changelog
debian/control
patches/de.po.diff patches/series upstream/patches/7.0.040
upstream/patches/7.0.041 upstream/patches/7.0.042
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Mon Jul 24 04:00:50 UTC 2006
Author: jamessan
Date: Mon Jul 24 04:00:47 2006
New Revision: 734
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=734
Log:
Add upstream patches 40 - 42.
Add de.po.diff to fix German translation of recovery prompt.
Added:
trunk/packages/vim/patches/de.po.diff
trunk/packages/vim/upstream/patches/7.0.040
trunk/packages/vim/upstream/patches/7.0.041
trunk/packages/vim/upstream/patches/7.0.042
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/control
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=734&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Mon Jul 24 04:00:47 2006
@@ -64,3 +64,6 @@
1880 7.0.037 crash when resizing Vim window when a line doesn't fit
3236 7.0.038 complete() can be used from expr. mapping after inserting text
3240 7.0.039 third argument for inputdialog() doesn't work in the console
+ 1946 7.0.040 mouse selection with "z=" and inputlist() gets wrong entry
+ 2229 7.0.041 cursor([1, 2]) failed, required third item in the list
+ 1603 7.0.042 crash or hang when pasting a block in Insert mode
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=734&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Jul 24 04:00:47 2006
@@ -1,9 +1,14 @@
-vim (1:7.0-039+1) UNRELEASED; urgency=low
+vim (1:7.0-042+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (036 - 039), see README.gz for details.
-
- -- James Vega <jamessan at debian.org> Wed, 19 Jul 2006 10:07:23 -0400
+ * New upstream patches (036 - 042), see README.gz for details.
+
+ [ James Vega ]
+ * Add patches/de.po.diff, which differentiates between "Delete" and
+ "Readonly" swap recovery messages for the German translation.
+ (closes: #379507)
+
+ -- James Vega <jamessan at debian.org> Sun, 23 Jul 2006 23:58:08 -0400
vim (1:7.0-035+1) unstable; urgency=low
Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=734&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Mon Jul 24 04:00:47 2006
@@ -4,7 +4,7 @@
Maintainer: Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>
Uploaders: Norbert Tretkowski <nobse at debian.org>, Pierre Habouzit <madcoder at debian.org>, Matthijs Mohlmann <matthijs at cacholong.nl>, Stefano Zacchiroli <zack at debian.org>, Alexis Sukrieh <sukria at sukria.net>, Pepijn de Langen <pepijn at ce.et.tudelft.nl>, James Vega <jamessan at debian.org>
Standards-Version: 3.6.2
-Build-Depends: debhelper (>= 4.2.21), dpkg (>> 1.7.0), dpkg-dev (>= 1.13.19), bzip2, perl (>= 5.6), libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev [!hurd-i386], python-dev, libxpm-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif2-dev, quilt, make (>= 3.80+3.81.b4)
+Build-Depends: debhelper (>= 4.2.21), dpkg (>> 1.7.0), dpkg-dev (>= 1.13.19), bzip2, perl (>= 5.6), libgpmg1-dev [!hurd-i386] | not+linux-gnu, libperl-dev (>= 5.6), tcl8.4-dev [!hurd-i386], python-dev, libxpm-dev, libncurses5-dev, ruby, ruby1.8-dev, libgtk2.0-dev (>= 2.2), libgnomeui-dev [!hurd-i386], lesstif-dev, quilt, make (>= 3.80+3.81.b4)
Build-Conflicts: libperl-dev (= 5.8.4-1)
Package: vim-common
Added: trunk/packages/vim/patches/de.po.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/de.po.diff?rev=734&op=file
==============================================================================
--- trunk/packages/vim/patches/de.po.diff (added)
+++ trunk/packages/vim/patches/de.po.diff Mon Jul 24 04:00:47 2006
@@ -1,0 +1,41 @@
+Index: vim/src/po/de.po
+===================================================================
+--- vim/src/po/de.po.orig
++++ vim/src/po/de.po
+@@ -11,7 +11,7 @@
+ msgstr ""
+ "Project-Id-Version: Vim(deutsch)\n"
+ "POT-Creation-Date: 2006-04-02 11:30+0200\n"
+-"PO-Revision-Date: 2006-04-02 17:26+0200\n"
++"PO-Revision-Date: 2006-06-18 12:34+0200\n"
+ "Last-Translator: Georg Dahn <gorgyd at yahoo.co.uk>\n"
+ "Language-Team: German <de at li.org>\n"
+ "MIME-Version: 1.0\n"
+@@ -3502,7 +3502,7 @@
+ "&Quit\n"
+ "&Abort"
+ msgstr ""
+-"Öffnen nur zum &Lesen\n"
++"Nur zum &Lesen öffnen\n"
+ "Trotzdem &editieren\n"
+ "&Wiederherstellen\n"
+ "&Beenden\n"
+@@ -3516,10 +3516,10 @@
+ "&Quit\n"
+ "&Abort"
+ msgstr ""
+-"Öffnen nur zum &Lesen\n"
++"Nur zum &Lesen öffnen\n"
+ "Trotzdem &editieren\n"
+ "&Wiederherstellen\n"
+-"&Löschen\n"
++"&Datei Löschen\n"
+ "&Beenden\n"
+ "&Abbrechen"
+
+@@ -6131,3 +6131,5 @@
+ "Die Definition von COMPOUNDPERMITFLAG nach dem PFX Element kann falsches Ergebnis in Zeile %s ergeben "
+ "%d"
+
++msgid "E116: Invalid arguments for function %s"
++msgstr "E116: Ungültige Argumente für die Funktion %s"
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=734&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Mon Jul 24 04:00:47 2006
@@ -6,3 +6,4 @@
debchangelog.vim.diff -p0
scripts.vim.diff -p0
php.vim.diff -p0
+de.po.diff -p0
Added: trunk/packages/vim/upstream/patches/7.0.040
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.040?rev=734&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.040 (added)
+++ trunk/packages/vim/upstream/patches/7.0.040 Mon Jul 24 04:00:47 2006
@@ -1,0 +1,60 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.040
+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.040
+Problem: When 'cmdheight' is larger than 1 using inputlist() or selecting
+ a spell suggestion with the mouse gets the wrong entry.
+Solution: Start listing the first alternative on the last line of the screen.
+Files: src/eval.c, src/spell.c
+
+
+*** ../vim-7.0.039/src/eval.c Thu Jul 13 08:30:50 2006
+--- src/eval.c Mon Jul 10 23:03:13 2006
+***************
+*** 11497,11502 ****
+--- 11497,11503 ----
+ }
+
+ msg_start();
++ msg_row = Rows - 1; /* for when 'cmdheight' > 1 */
+ lines_left = Rows; /* avoid more prompt */
+ msg_scroll = TRUE;
+ msg_clr_eos();
+*** ../vim-7.0.039/src/spell.c Sat May 13 14:12:51 2006
+--- src/spell.c Mon Jul 10 23:03:04 2006
+***************
+*** 10071,10076 ****
+--- 10071,10077 ----
+
+ /* List the suggestions. */
+ msg_start();
++ msg_row = Rows - 1; /* for when 'cmdheight' > 1 */
+ lines_left = Rows; /* avoid more prompt */
+ vim_snprintf((char *)IObuff, IOSIZE, _("Change \"%.*s\" to:"),
+ sug.su_badlen, sug.su_badptr);
+*** ../vim-7.0.039/src/version.c Thu Jul 13 08:30:50 2006
+--- src/version.c Sun Jul 23 21:51:04 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 40,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+40. You tell the cab driver you live at
+ http://123.elm.street/house/bluetrim.html
+41. You actually try that 123.elm.street address.
+
+ /// 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.041
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.041?rev=734&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.041 (added)
+++ trunk/packages/vim/upstream/patches/7.0.041 Mon Jul 24 04:00:47 2006
@@ -1,0 +1,81 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.041
+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.041
+Problem: cursor([1, 1]) doesn't work. (Peter Hodge)
+Solution: Allow leaving out the third item of the list and use zero for the
+ virtual column offset.
+Files: src/eval.c
+
+
+*** ../vim-7.0.040/src/eval.c Sun Jul 23 21:52:16 2006
+--- src/eval.c Mon Jul 10 23:03:13 2006
+***************
+*** 16465,16473 ****
+ long i = 0;
+ long n;
+
+! /* List must be: [fnum, lnum, col, coladd] */
+! if (arg->v_type != VAR_LIST || l == NULL
+! || l->lv_len != (fnump == NULL ? 3 : 4))
+ return FAIL;
+
+ if (fnump != NULL)
+--- 16465,16476 ----
+ long i = 0;
+ long n;
+
+! /* List must be: [fnum, lnum, col, coladd], where "fnum" is only there
+! * when "fnump" isn't NULL and "coladd" is optional. */
+! if (arg->v_type != VAR_LIST
+! || l == NULL
+! || l->lv_len < (fnump == NULL ? 2 : 3)
+! || l->lv_len > (fnump == NULL ? 3 : 4))
+ return FAIL;
+
+ if (fnump != NULL)
+***************
+*** 16493,16500 ****
+ #ifdef FEAT_VIRTUALEDIT
+ n = list_find_nr(l, i, NULL);
+ if (n < 0)
+! return FAIL;
+! posp->coladd = n;
+ #endif
+
+ return OK;
+--- 16496,16504 ----
+ #ifdef FEAT_VIRTUALEDIT
+ n = list_find_nr(l, i, NULL);
+ if (n < 0)
+! posp->coladd = 0;
+! else
+! posp->coladd = n;
+ #endif
+
+ return OK;
+*** ../vim-7.0.040/src/version.c Sun Jul 23 21:52:16 2006
+--- src/version.c Sun Jul 23 21:59:43 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 41,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+43. You tell the kids they can't use the computer because "Daddy's got work to
+ do" and you don't even have a job.
+
+ /// 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.042
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.042?rev=734&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.042 (added)
+++ trunk/packages/vim/upstream/patches/7.0.042 Mon Jul 24 04:00:47 2006
@@ -1,0 +1,54 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.042
+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.042
+Problem: When pasting a block of text in Insert mode Vim hangs or crashes.
+ (Noam Halevy)
+Solution: Avoid that the cursor is positioned past the NUL of a line.
+Files: src/ops.c
+
+
+*** ../vim-7.0.041/src/ops.c Tue Jun 20 20:29:13 2006
+--- src/ops.c Sun Jul 23 22:36:39 2006
+***************
+*** 3493,3500 ****
+--- 3493,3507 ----
+ # endif
+ if (flags & PUT_CURSEND)
+ {
++ colnr_T len;
++
+ curwin->w_cursor = curbuf->b_op_end;
+ curwin->w_cursor.col++;
++
++ /* in Insert mode we might be after the NUL, correct for that */
++ len = (colnr_T)STRLEN(ml_get_curline());
++ if (curwin->w_cursor.col > len)
++ curwin->w_cursor.col = len;
+ }
+ else
+ curwin->w_cursor.lnum = lnum;
+*** ../vim-7.0.041/src/version.c Sun Jul 23 22:07:55 2006
+--- src/version.c Sun Jul 23 22:35:13 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 42,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+45. You buy a Captain Kirk chair with a built-in keyboard and mouse.
+
+ /// 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