r809 - in /trunk/packages/vim: debian/README debian/changelog
debian/control
debian/rules debian/vim-runtime.prerm debian/vim-variant.postrm
upstream/patches/7.0.159 upstream/patches/7.0.160 upstream/patches/7.0.161
upstream/patches/7.0.162
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue Nov 14 13:59:51 UTC 2006
Author: jamessan
Date: Tue Nov 14 14:59:50 2006
New Revision: 809
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=809
Log:
Add upstream patches 159 - 162.
Remove /usr/share/vim/addons/doc/tags generation from debian/rules and remove the tags file in vim-runtime.prerm. (#397837)
Remove the empty vim-variant.postrm.
Add "Provides: editor" for the gvim variants. (#398572)
Added:
trunk/packages/vim/debian/vim-runtime.prerm
trunk/packages/vim/upstream/patches/7.0.159
trunk/packages/vim/upstream/patches/7.0.160
trunk/packages/vim/upstream/patches/7.0.161
trunk/packages/vim/upstream/patches/7.0.162
Removed:
trunk/packages/vim/debian/vim-variant.postrm
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/control
trunk/packages/vim/debian/rules
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=809&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Nov 14 14:59:50 2006
@@ -188,3 +188,7 @@
21499 7.0.156 (extra) Vim doesn't compile on Amiga OS4
3594 7.0.157 profiling info was bogus for a recursively called function
1485 7.0.158 cursor in closed fold after adding new line
+ 2455 7.0.159 not enough information for an I/O error in the swap file
+ 9446 7.0.160 ":@a" echoes the command
+ 6639 7.0.161 (extra) Win32: window and tabline menu may use wrong encoding
+ 5819 7.0.162 doesn't exit with "vim -o a b" and abort at ATTENTION prompt
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=809&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Nov 14 14:59:50 2006
@@ -1,3 +1,18 @@
+vim (1:7.0-162+1) unstable; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream patches (159 - 162), see README.gz for details.
+
+ [ James Vega ]
+ * Shipped tags file was being regenerated (closes: #397837)
+ - Do not pre-generate tags file, vim-runtime's postinst is already
+ handling tag generation
+ - Remove tags file in vim-runtime's prerm
+ * Add Provides: editor to the gvim variants. (closes: #398572)
+ * Remove the empty vim-variant.postrm.
+
+ -- James Vega <jamessan at debian.org> Tue, 14 Nov 2006 08:55:49 -0500
+
vim (1:7.0-158+1) unstable; urgency=medium
[ Debian Vim Maintainers ]
Modified: trunk/packages/vim/debian/control
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/control?rev=809&op=diff
==============================================================================
--- trunk/packages/vim/debian/control (original)
+++ trunk/packages/vim/debian/control Tue Nov 14 14:59:50 2006
@@ -121,7 +121,7 @@
Architecture: any
Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera, gnome-icon-theme
-Provides: gvim
+Provides: gvim, editor
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
Replaces: vim (<= 1:6.3-068+1), vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3)
Description: Vi IMproved - enhanced vi editor - with Perl support
@@ -139,7 +139,7 @@
Architecture: any
Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera, gnome-icon-theme
-Provides: gvim
+Provides: gvim, editor
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
Replaces: vim (<= 1:6.3-068+1), vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3)
Description: Vi IMproved - enhanced vi editor - with Python support
@@ -157,7 +157,7 @@
Architecture: any
Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera, gnome-icon-theme
-Provides: gvim
+Provides: gvim, editor
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
Replaces: vim (<= 1:6.3-068+1), vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3)
Description: Vi IMproved - enhanced vi editor - with Ruby support
@@ -175,7 +175,7 @@
Architecture: any
Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera, gnome-icon-theme
-Provides: gvim
+Provides: gvim, editor
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
Replaces: vim (<= 1:6.3-068+1), vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3)
Description: Vi IMproved - enhanced vi editor - with TCL support
@@ -193,7 +193,7 @@
Architecture: any
Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera, gnome-icon-theme
-Provides: gvim
+Provides: gvim, editor
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
Replaces: vim (<= 1:6.3-068+1), vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3)
Description: Vi IMproved - enhanced vi editor - with GTK2 GUI
@@ -211,7 +211,7 @@
Architecture: any
Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera
-Provides: gvim
+Provides: gvim, editor
Conflicts: vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
Replaces: vim (<= 1:6.3-068+1), vim-full (<< 1:6.4-001+3), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3)
Description: Vi IMproved - enhanced vi editor - with LessTif GUI
@@ -229,7 +229,7 @@
Architecture: any
Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera, gnome-icon-theme
-Provides: gvim
+Provides: gvim, editor
Conflicts: vim-full (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
Replaces: vim (<= 1:6.3-068+1), vim-full (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3)
Description: Vi IMproved - enhanced vi editor - with GNOME2 GUI
@@ -247,7 +247,7 @@
Architecture: any
Depends: vim-gui-common (= ${source:Version}), vim-common (= ${binary:Version}), vim-runtime (= ${source:Version}), ${shlibs:Depends}
Suggests: cscope, vim-doc, ttf-bitstream-vera, gnome-icon-theme
-Provides: gvim
+Provides: gvim, editor
Conflicts: vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3), vim-common (<< 1:6.4-001+3)
Replaces: vim (<= 1:6.3-068+1), vim-gnome (<< 1:6.4-001+3), vim-gtk (<< 1:6.4-001+3), vim-lesstif (<< 1:6.4-001+3), vim-perl (<< 1:6.4-001+3), vim-python (<< 1:6.4-001+3), vim-ruby (<< 1:6.4-001+3), vim-tcl (<< 1:6.4-001+3), vim-tiny (<< 1:6.4-001+3)
Description: Vi IMproved - enhanced vi editor - full fledged version
Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=809&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Tue Nov 14 14:59:50 2006
@@ -173,7 +173,7 @@
EXTRA_TARBALL=$(NAME)-$(VERSION)-extra.tar.gz
SOURCES = $(MAIN_TARBALL) $(LANG_TARBALL) $(EXTRA_TARBALL)
BASE_URL=ftp://ftp.vim.org/pub/vim
-PER_VARIANT_FILES = install postinst postrm prerm links preinst
+PER_VARIANT_FILES = install postinst prerm links preinst
LANGS += fr fr.ISO8859-1 fr.UTF-8
LANGS += it it.ISO8859-1 it.UTF-8
LANGS += pl pl.ISO8859-2 pl.UTF-8
@@ -433,9 +433,6 @@
done
dh_link
- # Generate helptags for any docs in /usr/share/vim/addons/doc
- perl debian/vim-common/usr/bin/helpztags debian/vim-runtime/usr/share/vim/addons/doc
-
# all excepts vim
dh_installchangelogs -Nvim
dh_installdocs
Added: trunk/packages/vim/debian/vim-runtime.prerm
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-runtime.prerm?rev=809&op=file
==============================================================================
--- trunk/packages/vim/debian/vim-runtime.prerm (added)
+++ trunk/packages/vim/debian/vim-runtime.prerm Tue Nov 14 14:59:50 2006
@@ -1,0 +1,7 @@
+#!/bin/sh
+
+rm -f /usr/share/vim/addons/doc/tags
+
+#DEBHELPER#
+
+exit 0
Added: trunk/packages/vim/upstream/patches/7.0.159
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.159?rev=809&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.159 (added)
+++ trunk/packages/vim/upstream/patches/7.0.159 Tue Nov 14 14:59:50 2006
@@ -1,0 +1,80 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.159
+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.159
+Problem: When there is an I/O error in the swap file the cause of the error
+ cannot be seen.
+Solution: Use PERROR() instead of EMSG() where possible.
+Files: src/memfile.c
+
+
+*** ../vim-7.0.158/src/memfile.c Wed Nov 1 18:10:36 2006
+--- src/memfile.c Wed Nov 1 21:38:59 2006
+***************
+*** 1028,1039 ****
+ size = page_size * hp->bh_page_count;
+ if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset)
+ {
+! EMSG(_("E294: Seek error in swap file read"));
+ return FAIL;
+ }
+ if ((unsigned)vim_read(mfp->mf_fd, hp->bh_data, size) != size)
+ {
+! EMSG(_("E295: Read error in swap file"));
+ return FAIL;
+ }
+ return OK;
+--- 1028,1039 ----
+ size = page_size * hp->bh_page_count;
+ if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset)
+ {
+! PERROR(_("E294: Seek error in swap file read"));
+ return FAIL;
+ }
+ if ((unsigned)vim_read(mfp->mf_fd, hp->bh_data, size) != size)
+ {
+! PERROR(_("E295: Read error in swap file"));
+ return FAIL;
+ }
+ return OK;
+***************
+*** 1085,1091 ****
+ offset = (off_t)page_size * nr;
+ if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset)
+ {
+! EMSG(_("E296: Seek error in swap file write"));
+ return FAIL;
+ }
+ if (hp2 == NULL) /* freed block, fill with dummy data */
+--- 1085,1091 ----
+ offset = (off_t)page_size * nr;
+ if (lseek(mfp->mf_fd, offset, SEEK_SET) != offset)
+ {
+! PERROR(_("E296: Seek error in swap file write"));
+ return FAIL;
+ }
+ if (hp2 == NULL) /* freed block, fill with dummy data */
+*** ../vim-7.0.158/src/version.c Wed Nov 1 21:24:58 2006
+--- src/version.c Tue Nov 7 17:58:58 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 159,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+171. You invent another person and chat with yourself in empty chat rooms.
+
+ /// 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.160
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.160?rev=809&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.160 (added)
+++ trunk/packages/vim/upstream/patches/7.0.160 Tue Nov 14 14:59:50 2006
@@ -1,0 +1,309 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.160
+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.160
+Problem: ":@a" echoes the command, Vi doesn't do that.
+Solution: Set the silent flag in the typeahead buffer to avoid echoing the
+ command.
+Files: src/ex_docmd.c, src/normal.c, src/ops.c, src/proto/ops.pro
+
+
+*** ../vim-7.0.159/src/ex_docmd.c Tue Oct 24 13:02:27 2006
+--- src/ex_docmd.c Tue Nov 7 17:42:52 2006
+***************
+*** 8219,8226 ****
+ c = *eap->arg;
+ if (c == NUL || (c == '*' && *eap->cmd == '*'))
+ c = '@';
+! /* put the register in mapbuf */
+! if (do_execreg(c, TRUE, vim_strchr(p_cpo, CPO_EXECBUF) != NULL) == FAIL)
+ {
+ beep_flush();
+ }
+--- 8219,8227 ----
+ c = *eap->arg;
+ if (c == NUL || (c == '*' && *eap->cmd == '*'))
+ c = '@';
+! /* Put the register in the typeahead buffer with the "silent" flag. */
+! if (do_execreg(c, TRUE, vim_strchr(p_cpo, CPO_EXECBUF) != NULL, TRUE)
+! == FAIL)
+ {
+ beep_flush();
+ }
+*** ../vim-7.0.159/src/normal.c Tue Oct 17 22:40:14 2006
+--- src/normal.c Tue Nov 7 17:42:59 2006
+***************
+*** 8860,8866 ****
+ #endif
+ while (cap->count1-- && !got_int)
+ {
+! if (do_execreg(cap->nchar, FALSE, FALSE) == FAIL)
+ {
+ clearopbeep(cap->oap);
+ break;
+--- 8860,8866 ----
+ #endif
+ while (cap->count1-- && !got_int)
+ {
+! if (do_execreg(cap->nchar, FALSE, FALSE, FALSE) == FAIL)
+ {
+ clearopbeep(cap->oap);
+ break;
+*** ../vim-7.0.159/src/ops.c Tue Oct 17 16:26:52 2006
+--- src/ops.c Tue Nov 7 17:52:30 2006
+***************
+*** 95,102 ****
+ static void block_insert __ARGS((oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp));
+ #endif
+ static int stuff_yank __ARGS((int, char_u *));
+! static void put_reedit_in_typebuf __ARGS((void));
+! static int put_in_typebuf __ARGS((char_u *s, int colon));
+ static void stuffescaped __ARGS((char_u *arg, int literally));
+ #ifdef FEAT_MBYTE
+ static void mb_adjust_opend __ARGS((oparg_T *oap));
+--- 95,102 ----
+ static void block_insert __ARGS((oparg_T *oap, char_u *s, int b_insert, struct block_def*bdp));
+ #endif
+ static int stuff_yank __ARGS((int, char_u *));
+! static void put_reedit_in_typebuf __ARGS((int silent));
+! static int put_in_typebuf __ARGS((char_u *s, int colon, int silent));
+ static void stuffescaped __ARGS((char_u *arg, int literally));
+ #ifdef FEAT_MBYTE
+ static void mb_adjust_opend __ARGS((oparg_T *oap));
+***************
+*** 1120,1129 ****
+ * return FAIL for failure, OK otherwise
+ */
+ int
+! do_execreg(regname, colon, addcr)
+ int regname;
+ int colon; /* insert ':' before each line */
+ int addcr; /* always add '\n' to end of line */
+ {
+ static int lastc = NUL;
+ long i;
+--- 1120,1130 ----
+ * return FAIL for failure, OK otherwise
+ */
+ int
+! do_execreg(regname, colon, addcr, silent)
+ int regname;
+ int colon; /* insert ':' before each line */
+ int addcr; /* always add '\n' to end of line */
++ int silent; /* set "silent" flag in typeahead buffer */
+ {
+ static int lastc = NUL;
+ long i;
+***************
+*** 1173,1181 ****
+ /* When in Visual mode "'<,'>" will be prepended to the command.
+ * Remove it when it's already there. */
+ if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0)
+! retval = put_in_typebuf(p + 5, TRUE);
+ else
+! retval = put_in_typebuf(p, TRUE);
+ }
+ vim_free(p);
+ }
+--- 1174,1182 ----
+ /* When in Visual mode "'<,'>" will be prepended to the command.
+ * Remove it when it's already there. */
+ if (VIsual_active && STRNCMP(p, "'<,'>", 5) == 0)
+! retval = put_in_typebuf(p + 5, TRUE, silent);
+ else
+! retval = put_in_typebuf(p, TRUE, silent);
+ }
+ vim_free(p);
+ }
+***************
+*** 1186,1192 ****
+ p = get_expr_line();
+ if (p == NULL)
+ return FAIL;
+! retval = put_in_typebuf(p, colon);
+ vim_free(p);
+ }
+ #endif
+--- 1187,1193 ----
+ p = get_expr_line();
+ if (p == NULL)
+ return FAIL;
+! retval = put_in_typebuf(p, colon, silent);
+ vim_free(p);
+ }
+ #endif
+***************
+*** 1198,1204 ****
+ EMSG(_(e_noinstext));
+ return FAIL;
+ }
+! retval = put_in_typebuf(p, colon);
+ vim_free(p);
+ }
+ else
+--- 1199,1205 ----
+ EMSG(_(e_noinstext));
+ return FAIL;
+ }
+! retval = put_in_typebuf(p, colon, silent);
+ vim_free(p);
+ }
+ else
+***************
+*** 1213,1232 ****
+ /*
+ * Insert lines into typeahead buffer, from last one to first one.
+ */
+! put_reedit_in_typebuf();
+ for (i = y_current->y_size; --i >= 0; )
+ {
+ /* insert NL between lines and after last line if type is MLINE */
+ if (y_current->y_type == MLINE || i < y_current->y_size - 1
+ || addcr)
+ {
+! if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, FALSE) == FAIL)
+ return FAIL;
+ }
+! if (ins_typebuf(y_current->y_array[i], remap, 0, TRUE, FALSE)
+ == FAIL)
+ return FAIL;
+! if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, FALSE)
+ == FAIL)
+ return FAIL;
+ }
+--- 1214,1233 ----
+ /*
+ * Insert lines into typeahead buffer, from last one to first one.
+ */
+! put_reedit_in_typebuf(silent);
+ for (i = y_current->y_size; --i >= 0; )
+ {
+ /* insert NL between lines and after last line if type is MLINE */
+ if (y_current->y_type == MLINE || i < y_current->y_size - 1
+ || addcr)
+ {
+! if (ins_typebuf((char_u *)"\n", remap, 0, TRUE, silent) == FAIL)
+ return FAIL;
+ }
+! if (ins_typebuf(y_current->y_array[i], remap, 0, TRUE, silent)
+ == FAIL)
+ return FAIL;
+! if (colon && ins_typebuf((char_u *)":", remap, 0, TRUE, silent)
+ == FAIL)
+ return FAIL;
+ }
+***************
+*** 1240,1246 ****
+ * used only after other typeahead has been processed.
+ */
+ static void
+! put_reedit_in_typebuf()
+ {
+ char_u buf[3];
+
+--- 1241,1248 ----
+ * used only after other typeahead has been processed.
+ */
+ static void
+! put_reedit_in_typebuf(silent)
+! int silent;
+ {
+ char_u buf[3];
+
+***************
+*** 1257,1281 ****
+ buf[0] = restart_edit == 'I' ? 'i' : restart_edit;
+ buf[1] = NUL;
+ }
+! if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, FALSE) == OK)
+ restart_edit = NUL;
+ }
+ }
+
+ static int
+! put_in_typebuf(s, colon)
+ char_u *s;
+ int colon; /* add ':' before the line */
+ {
+ int retval = OK;
+
+! put_reedit_in_typebuf();
+ if (colon)
+! retval = ins_typebuf((char_u *)"\n", REMAP_YES, 0, TRUE, FALSE);
+ if (retval == OK)
+! retval = ins_typebuf(s, REMAP_YES, 0, TRUE, FALSE);
+ if (colon && retval == OK)
+! retval = ins_typebuf((char_u *)":", REMAP_YES, 0, TRUE, FALSE);
+ return retval;
+ }
+
+--- 1259,1284 ----
+ buf[0] = restart_edit == 'I' ? 'i' : restart_edit;
+ buf[1] = NUL;
+ }
+! if (ins_typebuf(buf, REMAP_NONE, 0, TRUE, silent) == OK)
+ restart_edit = NUL;
+ }
+ }
+
+ static int
+! put_in_typebuf(s, colon, silent)
+ char_u *s;
+ int colon; /* add ':' before the line */
++ int silent;
+ {
+ int retval = OK;
+
+! put_reedit_in_typebuf(silent);
+ if (colon)
+! retval = ins_typebuf((char_u *)"\n", REMAP_YES, 0, TRUE, silent);
+ if (retval == OK)
+! retval = ins_typebuf(s, REMAP_YES, 0, TRUE, silent);
+ if (colon && retval == OK)
+! retval = ins_typebuf((char_u *)":", REMAP_YES, 0, TRUE, silent);
+ return retval;
+ }
+
+*** ../vim-7.0.159/src/proto/ops.pro Tue Oct 17 16:26:52 2006
+--- src/proto/ops.pro Tue Nov 7 18:08:35 2006
+***************
+*** 17,23 ****
+ extern void put_register __ARGS((int name, void *reg));
+ extern int yank_register_mline __ARGS((int regname));
+ extern int do_record __ARGS((int c));
+! extern int do_execreg __ARGS((int regname, int colon, int addcr));
+ extern int insert_reg __ARGS((int regname, int literally));
+ extern int get_spec_reg __ARGS((int regname, char_u **argp, int *allocated, int errmsg));
+ extern int cmdline_paste_reg __ARGS((int regname, int literally, int remcr));
+--- 17,23 ----
+ extern void put_register __ARGS((int name, void *reg));
+ extern int yank_register_mline __ARGS((int regname));
+ extern int do_record __ARGS((int c));
+! extern int do_execreg __ARGS((int regname, int colon, int addcr, int silent));
+ extern int insert_reg __ARGS((int regname, int literally));
+ extern int get_spec_reg __ARGS((int regname, char_u **argp, int *allocated, int errmsg));
+ extern int cmdline_paste_reg __ARGS((int regname, int literally, int remcr));
+*** ../vim-7.0.159/src/version.c Tue Nov 7 18:02:19 2006
+--- src/version.c Tue Nov 7 18:05:36 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 160,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+172. You join listservers just for the extra e-mail.
+
+ /// 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.161
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.161?rev=809&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.161 (added)
+++ trunk/packages/vim/upstream/patches/7.0.161 Tue Nov 14 14:59:50 2006
@@ -1,0 +1,244 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.161
+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.161
+Problem: Win32: Tab pages line popup menu isn't using the right encoding.
+ (Yongwei Wu)
+Solution: Convert the text when necessary. Also fixes the Find/Replace
+ dialog title. (Yegappan Lakshmanan)
+Files: src/gui_w48.c
+
+
+*** ../vim-7.0.160/src/gui_w48.c Tue Aug 29 21:30:15 2006
+--- src/gui_w48.c Tue Nov 7 19:03:52 2006
+***************
+*** 2217,2226 ****
+
+ #if defined(FEAT_GUI_TABLINE) || defined(PROTO)
+ static void
+ show_tabline_popup_menu(void)
+ {
+ HMENU tab_pmenu;
+- MENUITEMINFO minfo;
+ long rval;
+ POINT pt;
+
+--- 2217,2270 ----
+
+ #if defined(FEAT_GUI_TABLINE) || defined(PROTO)
+ static void
++ add_tabline_popup_menu_entry(HMENU pmenu, UINT item_id, char_u *item_text)
++ {
++ #ifdef FEAT_MBYTE
++ WCHAR *wn = NULL;
++ int n;
++
++ if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
++ {
++ /* 'encoding' differs from active codepage: convert menu name
++ * and use wide function */
++ wn = enc_to_ucs2(item_text, NULL);
++ if (wn != NULL)
++ {
++ MENUITEMINFOW infow;
++
++ infow.cbSize = sizeof(infow);
++ infow.fMask = MIIM_TYPE | MIIM_ID;
++ infow.wID = item_id;
++ infow.fType = MFT_STRING;
++ infow.dwTypeData = wn;
++ infow.cch = (UINT)wcslen(wn);
++ n = InsertMenuItemW(pmenu, item_id, FALSE, &infow);
++ vim_free(wn);
++ if (n == 0 && GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
++ /* Failed, try using non-wide function. */
++ wn = NULL;
++ }
++ }
++
++ if (wn == NULL)
++ #endif
++ {
++ MENUITEMINFO info;
++
++ info.cbSize = sizeof(info);
++ info.fMask = MIIM_TYPE | MIIM_ID;
++ info.wID = item_id;
++ info.fType = MFT_STRING;
++ info.dwTypeData = item_text;
++ info.cch = (UINT)STRLEN(item_text);
++ InsertMenuItem(pmenu, item_id, FALSE, &info);
++ }
++ }
++
++ static void
+ show_tabline_popup_menu(void)
+ {
+ HMENU tab_pmenu;
+ long rval;
+ POINT pt;
+
+***************
+*** 2236,2256 ****
+ if (tab_pmenu == NULL)
+ return;
+
+! minfo.cbSize = sizeof(MENUITEMINFO);
+! minfo.fMask = MIIM_TYPE|MIIM_ID;
+! minfo.fType = MFT_STRING;
+!
+! minfo.dwTypeData = _("Close tab");
+! minfo.wID = TABLINE_MENU_CLOSE;
+! InsertMenuItem(tab_pmenu, TABLINE_MENU_CLOSE, FALSE, &minfo);
+!
+! minfo.dwTypeData = _("New tab");
+! minfo.wID = TABLINE_MENU_NEW;
+! InsertMenuItem(tab_pmenu, TABLINE_MENU_NEW, FALSE, &minfo);
+!
+! minfo.dwTypeData = _("Open tab...");
+! minfo.wID = TABLINE_MENU_OPEN;
+! InsertMenuItem(tab_pmenu, TABLINE_MENU_OPEN, FALSE, &minfo);
+
+ GetCursorPos(&pt);
+ rval = TrackPopupMenuEx(tab_pmenu, TPM_RETURNCMD, pt.x, pt.y, s_tabhwnd,
+--- 2280,2289 ----
+ if (tab_pmenu == NULL)
+ return;
+
+! add_tabline_popup_menu_entry(tab_pmenu, TABLINE_MENU_CLOSE, _("Close tab"));
+! add_tabline_popup_menu_entry(tab_pmenu, TABLINE_MENU_NEW, _("New tab"));
+! add_tabline_popup_menu_entry(tab_pmenu, TABLINE_MENU_OPEN,
+! _("Open tab..."));
+
+ GetCursorPos(&pt);
+ rval = TrackPopupMenuEx(tab_pmenu, TPM_RETURNCMD, pt.x, pt.y, s_tabhwnd,
+***************
+*** 2455,2460 ****
+--- 2488,2517 ----
+ }
+ #endif
+
++ static void
++ set_window_title(HWND hwnd, char *title)
++ {
++ #ifdef FEAT_MBYTE
++ if (title != NULL && enc_codepage >= 0 && enc_codepage != (int)GetACP())
++ {
++ WCHAR *wbuf;
++ int n;
++
++ /* Convert the title from 'encoding' to ucs2. */
++ wbuf = (WCHAR *)enc_to_ucs2((char_u *)title, NULL);
++ if (wbuf != NULL)
++ {
++ n = SetWindowTextW(hwnd, wbuf);
++ vim_free(wbuf);
++ if (n != 0 || GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
++ return;
++ /* Retry with non-wide function (for Windows 98). */
++ }
++ }
++ #endif
++ (void)SetWindowText(hwnd, (LPCSTR)title);
++ }
++
+ void
+ gui_mch_find_dialog(exarg_T *eap)
+ {
+***************
+*** 2470,2477 ****
+ s_findrep_hwnd = FindText((LPFINDREPLACE) &s_findrep_struct);
+ }
+
+! (void)SetWindowText(s_findrep_hwnd,
+! (LPCSTR)_("Find string (use '\\\\' to find a '\\')"));
+ (void)SetFocus(s_findrep_hwnd);
+
+ s_findrep_is_find = TRUE;
+--- 2527,2534 ----
+ s_findrep_hwnd = FindText((LPFINDREPLACE) &s_findrep_struct);
+ }
+
+! set_window_title(s_findrep_hwnd,
+! _("Find string (use '\\\\' to find a '\\')"));
+ (void)SetFocus(s_findrep_hwnd);
+
+ s_findrep_is_find = TRUE;
+***************
+*** 2495,2502 ****
+ s_findrep_hwnd = ReplaceText((LPFINDREPLACE) &s_findrep_struct);
+ }
+
+! (void)SetWindowText(s_findrep_hwnd,
+! (LPCSTR)_("Find & Replace (use '\\\\' to find a '\\')"));
+ (void)SetFocus(s_findrep_hwnd);
+
+ s_findrep_is_find = FALSE;
+--- 2552,2559 ----
+ s_findrep_hwnd = ReplaceText((LPFINDREPLACE) &s_findrep_struct);
+ }
+
+! set_window_title(s_findrep_hwnd,
+! _("Find & Replace (use '\\\\' to find a '\\')"));
+ (void)SetFocus(s_findrep_hwnd);
+
+ s_findrep_is_find = FALSE;
+***************
+*** 3015,3039 ****
+ char_u *title,
+ char_u *icon)
+ {
+! #ifdef FEAT_MBYTE
+! if (title != NULL && enc_codepage >= 0 && enc_codepage != (int)GetACP())
+! {
+! WCHAR *wbuf;
+! int n;
+!
+! /* Convert the title from 'encoding' to ucs2. */
+! wbuf = (WCHAR *)enc_to_ucs2(title, NULL);
+! if (wbuf != NULL)
+! {
+! n = SetWindowTextW(s_hwnd, wbuf);
+! vim_free(wbuf);
+! if (n != 0 || GetLastError() != ERROR_CALL_NOT_IMPLEMENTED)
+! return;
+! /* Retry with non-wide function (for Windows 98). */
+! }
+! }
+! #endif
+! SetWindowText(s_hwnd, (LPCSTR)(title == NULL ? "VIM" : (char *)title));
+ }
+
+ #ifdef FEAT_MOUSESHAPE
+--- 3072,3078 ----
+ char_u *title,
+ char_u *icon)
+ {
+! set_window_title(s_hwnd, (title == NULL ? "VIM" : (char *)title));
+ }
+
+ #ifdef FEAT_MOUSESHAPE
+*** ../vim-7.0.160/src/version.c Tue Nov 7 18:43:10 2006
+--- src/version.c Tue Nov 7 18:57:42 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 161,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+174. You know what a listserv is.
+
+ /// 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.162
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.162?rev=809&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.162 (added)
+++ trunk/packages/vim/upstream/patches/7.0.162 Tue Nov 14 14:59:50 2006
@@ -1,0 +1,200 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.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.0.162
+Problem: "vim -o a b" when file "a" triggers the ATTENTION dialog,
+ selecting "Quit" exits Vim instead of editing "b" only.
+ When file "b" triggers the ATTENTION dialog selecting "Quit" or
+ "Abort" results in editing file "a" in that window.
+Solution: When selecting "Abort" exit Vim. When selecting "Quit" close the
+ window. Also avoid hit-enter prompt when selecting Abort.
+Files: src/buffer.c, src/main.c
+
+
+*** ../vim-7.0.161/src/buffer.c Fri Oct 20 20:15:05 2006
+--- src/buffer.c Tue Nov 7 21:08:02 2006
+***************
+*** 4220,4226 ****
+
+ /* Use the name from the associated buffer if it exists. */
+ bp = buflist_findnr(aep->ae_fnum);
+! if (bp == NULL)
+ return aep->ae_fname;
+ return bp->b_fname;
+ }
+--- 4222,4228 ----
+
+ /* Use the name from the associated buffer if it exists. */
+ bp = buflist_findnr(aep->ae_fnum);
+! if (bp == NULL || bp->b_fname == NULL)
+ return aep->ae_fname;
+ return bp->b_fname;
+ }
+*** ../vim-7.0.161/src/main.c Tue Sep 5 12:57:14 2006
+--- src/main.c Tue Nov 7 22:35:49 2006
+***************
+*** 2392,2398 ****
+ (void)open_buffer(FALSE, NULL); /* create memfile, read file */
+
+ #if defined(HAS_SWAP_EXISTS_ACTION)
+! check_swap_exists_action();
+ #endif
+ #ifdef FEAT_AUTOCMD
+ dorewind = TRUE; /* start again */
+--- 2392,2414 ----
+ (void)open_buffer(FALSE, NULL); /* create memfile, read file */
+
+ #if defined(HAS_SWAP_EXISTS_ACTION)
+! if (swap_exists_action == SEA_QUIT)
+! {
+! if (got_int || only_one_window())
+! {
+! /* abort selected or quit and only one window */
+! did_emsg = FALSE; /* avoid hit-enter prompt */
+! getout(1);
+! }
+! /* We can't close the window, it would disturb what
+! * happens next. Clear the file name and set the arg
+! * index to -1 to delete it later. */
+! setfname(curbuf, NULL, NULL, FALSE);
+! curwin->w_arg_idx = -1;
+! swap_exists_action = SEA_NONE;
+! }
+! else
+! handle_swap_exists(NULL);
+ #endif
+ #ifdef FEAT_AUTOCMD
+ dorewind = TRUE; /* start again */
+***************
+*** 2432,2437 ****
+--- 2448,2455 ----
+ {
+ int arg_idx; /* index in argument list */
+ int i;
++ int advance = TRUE;
++ buf_T *old_curbuf;
+
+ # ifdef FEAT_AUTOCMD
+ /*
+***************
+*** 2440,2470 ****
+ ++autocmd_no_enter;
+ ++autocmd_no_leave;
+ # endif
+ arg_idx = 1;
+ for (i = 1; i < parmp->window_count; ++i)
+ {
+! if (parmp->window_layout == WIN_TABS)
+ {
+! if (curtab->tp_next == NULL) /* just checking */
+! break;
+! goto_tabpage(0);
+ }
+! else
+ {
+! if (curwin->w_next == NULL) /* just checking */
+! break;
+! win_enter(curwin->w_next, FALSE);
+ }
+
+ /* Only open the file if there is no file in this window yet (that can
+! * happen when .vimrc contains ":sall") */
+ if (curbuf == firstwin->w_buffer || curbuf->b_ffname == NULL)
+ {
+ curwin->w_arg_idx = arg_idx;
+! /* edit file from arg list, if there is one */
+ (void)do_ecmd(0, arg_idx < GARGCOUNT
+ ? alist_name(&GARGLIST[arg_idx]) : NULL,
+ NULL, NULL, ECMD_LASTL, ECMD_HIDE);
+ if (arg_idx == GARGCOUNT - 1)
+ arg_had_last = TRUE;
+ ++arg_idx;
+--- 2458,2522 ----
+ ++autocmd_no_enter;
+ ++autocmd_no_leave;
+ # endif
++
++ /* When w_arg_idx is -1 remove the window (see create_windows()). */
++ if (curwin->w_arg_idx == -1)
++ {
++ win_close(curwin, TRUE);
++ advance = FALSE;
++ }
++
+ arg_idx = 1;
+ for (i = 1; i < parmp->window_count; ++i)
+ {
+! /* When w_arg_idx is -1 remove the window (see create_windows()). */
+! if (curwin->w_arg_idx == -1)
+ {
+! ++arg_idx;
+! win_close(curwin, TRUE);
+! advance = FALSE;
+! continue;
+ }
+!
+! if (advance)
+ {
+! if (parmp->window_layout == WIN_TABS)
+! {
+! if (curtab->tp_next == NULL) /* just checking */
+! break;
+! goto_tabpage(0);
+! }
+! else
+! {
+! if (curwin->w_next == NULL) /* just checking */
+! break;
+! win_enter(curwin->w_next, FALSE);
+! }
+ }
++ advance = TRUE;
+
+ /* Only open the file if there is no file in this window yet (that can
+! * happen when .vimrc contains ":sall"). */
+ if (curbuf == firstwin->w_buffer || curbuf->b_ffname == NULL)
+ {
+ curwin->w_arg_idx = arg_idx;
+! /* Edit file from arg list, if there is one. When "Quit" selected
+! * at the ATTENTION prompt close the window. */
+! old_curbuf = curbuf;
+ (void)do_ecmd(0, arg_idx < GARGCOUNT
+ ? alist_name(&GARGLIST[arg_idx]) : NULL,
+ NULL, NULL, ECMD_LASTL, ECMD_HIDE);
++ if (curbuf == old_curbuf)
++ {
++ if (got_int || only_one_window())
++ {
++ /* abort selected or quit and only one window */
++ did_emsg = FALSE; /* avoid hit-enter prompt */
++ getout(1);
++ }
++ win_close(curwin, TRUE);
++ advance = FALSE;
++ }
+ if (arg_idx == GARGCOUNT - 1)
+ arg_had_last = TRUE;
+ ++arg_idx;
+*** ../vim-7.0.161/src/version.c Tue Nov 7 19:05:36 2006
+--- src/version.c Tue Nov 7 21:21:28 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 162,
+ /**/
+
+--
+The CIA drives around in cars with the "Intel inside" logo.
+
+ /// 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