r724 - in /trunk/packages/vim: debian/README debian/changelog
debian/runtime/debian.vim.in upstream/patches/7.0.031
upstream/patches/7.0.032 upstream/patches/7.0.033 upstream/patches/7.0.034
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Fri Jun 23 18:07:40 UTC 2006
Author: jamessan
Date: Fri Jun 23 18:07:39 2006
New Revision: 724
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=724
Log:
Add upstream patches 031 - 034.
Rename the augroup in debian.vim from 'filetype' to 'debian' so it doesn't conflict with the FileType autocmd event.
Added:
trunk/packages/vim/upstream/patches/7.0.031
trunk/packages/vim/upstream/patches/7.0.032
trunk/packages/vim/upstream/patches/7.0.033
trunk/packages/vim/upstream/patches/7.0.034
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/runtime/debian.vim.in
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=724&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Fri Jun 23 18:07:39 2006
@@ -55,3 +55,7 @@
3014 7.0.028 (extra) OS/2: compilation problem
1494 7.0.029 cursor position may be wrong when using getchar()
1664 7.0.030 the ":compiler" command can't be used in a FileChangedRO event
+ 1808 7.0.031 after deleting a buffer its Select mode mappings remain
+ 1424 7.0.032 (extra, after 7.0.027) missing semicolon
+ 2431 7.0.033 pasting after autoindent removes the indent
+ 2042 7.0.034 repeating completion was wrong after typing text or using BS
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=724&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Fri Jun 23 18:07:39 2006
@@ -1,10 +1,12 @@
-vim (1:7.0-030+1) unstable; urgency=low
+vim (1:7.0-034+1) unstable; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (018 - 030), see README.gz for details.
+ * New upstream patches (018 - 034), see README.gz for details.
[ James Vega ]
* debian/control: Make Vim binNMUable.
+ * Rename the augroup in $VIMRUNTIME/debian.vim so it doesn't conflict with
+ Vim's FileType autocmd event.
[ Stefano Zacchiroli ]
* Removed patch edit.c.diff, no longer needed after upstream patch 023
Modified: trunk/packages/vim/debian/runtime/debian.vim.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/runtime/debian.vim.in?rev=724&op=diff
==============================================================================
--- trunk/packages/vim/debian/runtime/debian.vim.in (original)
+++ trunk/packages/vim/debian/runtime/debian.vim.in Fri Jun 23 18:07:39 2006
@@ -40,7 +40,7 @@
" Some Debian-specific things
if has("autocmd")
- augroup filetype
+ augroup debian
au BufRead reportbug.* set ft=mail
au BufRead reportbug-* set ft=mail
augroup END
Added: trunk/packages/vim/upstream/patches/7.0.031
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.031?rev=724&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.031 (added)
+++ trunk/packages/vim/upstream/patches/7.0.031 Fri Jun 23 18:07:39 2006
@@ -1,0 +1,58 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.031
+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.031
+Problem: When deleting a buffer the buffer-local mappings for Select mode
+ remain.
+Solution: Add the Select mode bit to MAP_ALL_MODES. (Edwin Steiner)
+Files: src/vim.h
+
+
+*** ../vim-7.0.030/src/vim.h Thu Jun 22 19:47:11 2006
+--- src/vim.h Fri Jun 23 16:29:03 2006
+***************
+*** 585,591 ****
+ #define INSERT 0x10 /* Insert mode */
+ #define LANGMAP 0x20 /* Language mapping, can be combined with
+ INSERT and CMDLINE */
+- #define MAP_ALL_MODES 0x3f /* all mode bits used for mapping */
+
+ #define REPLACE_FLAG 0x40 /* Replace mode flag */
+ #define REPLACE (REPLACE_FLAG + INSERT)
+--- 585,590 ----
+***************
+*** 604,609 ****
+--- 603,611 ----
+ #define SHOWMATCH (0x700 + INSERT) /* show matching paren */
+ #define CONFIRM 0x800 /* ":confirm" prompt */
+ #define SELECTMODE 0x1000 /* Select mode, only for mappings */
++
++ #define MAP_ALL_MODES (0x3f | SELECTMODE) /* all mode bits used for
++ * mapping */
+
+ /* directions */
+ #define FORWARD 1
+*** ../vim-7.0.030/src/version.c Thu Jun 22 21:15:46 2006
+--- src/version.c Fri Jun 23 16:33:25 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 31,
+ /**/
+
+--
+Why don't cannibals eat clowns?
+Because they taste funny.
+
+ /// 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.032
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.032?rev=724&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.032 (added)
+++ trunk/packages/vim/upstream/patches/7.0.032 Fri Jun 23 18:07:39 2006
@@ -1,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.032 (extra)
+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.032 (extra, after 7.0.027)
+Problem: Missing semicolon.
+Solution: Add the semicolon.
+Files: src/gui_w48.c
+
+
+*** ../vim-7.0.031/src/gui_w48.c Thu Jun 22 19:34:23 2006
+--- src/gui_w48.c Fri Jun 23 16:36:09 2006
+***************
+*** 1665,1671 ****
+ }
+ if (msg.message == WM_USER)
+ {
+! MyTranslateMessage(&msg)
+ DispatchMessage(&msg);
+ return;
+ }
+--- 1665,1671 ----
+ }
+ if (msg.message == WM_USER)
+ {
+! MyTranslateMessage(&msg);
+ DispatchMessage(&msg);
+ return;
+ }
+*** ../vim-7.0.031/src/version.c Fri Jun 23 16:33:41 2006
+--- src/version.c Fri Jun 23 16:37:24 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 32,
+ /**/
+
+--
+Snoring is prohibited unless all bedroom windows are closed and securely
+locked.
+ [real standing law in Massachusetts, United States of America]
+
+ /// 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.033
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.033?rev=724&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.033 (added)
+++ trunk/packages/vim/upstream/patches/7.0.033 Fri Jun 23 18:07:39 2006
@@ -1,0 +1,69 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.033
+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.033
+Problem: When pasting text, with the menu or CTRL-V, autoindent is removed.
+Solution: Use "x<BS>" to avoid indent to be removed. (Benji Fisher)
+Files: runtime/autoload/paste.vim
+
+
+*** ../vim-7.0.032/runtime/autoload/paste.vim Fri Apr 21 23:57:39 2006
+--- runtime/autoload/paste.vim Fri Jun 23 17:18:48 2006
+***************
+*** 1,6 ****
+ " Vim support file to help with paste mappings and menus
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2006 Apr 21
+
+ " Define the string to use for items that are present both in Edit, Popup and
+ " Toolbar menu. Also used in mswin.vim and macmap.vim.
+--- 1,6 ----
+ " Vim support file to help with paste mappings and menus
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2006 Jun 23
+
+ " Define the string to use for items that are present both in Edit, Popup and
+ " Toolbar menu. Also used in mswin.vim and macmap.vim.
+***************
+*** 12,18 ****
+ if has("virtualedit")
+ let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
+ let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
+! let paste#paste_cmd['i'] = '<Esc>' . paste#paste_cmd['n'] . 'gi'
+
+ func! paste#Paste()
+ let ove = &ve
+--- 12,18 ----
+ if has("virtualedit")
+ let paste#paste_cmd = {'n': ":call paste#Paste()<CR>"}
+ let paste#paste_cmd['v'] = '"-c<Esc>' . paste#paste_cmd['n']
+! let paste#paste_cmd['i'] = 'x<BS><Esc>' . paste#paste_cmd['n'] . 'gi'
+
+ func! paste#Paste()
+ let ove = &ve
+*** ../vim-7.0.032/src/version.c Fri Jun 23 16:44:32 2006
+--- src/version.c Fri Jun 23 17:18:56 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 33,
+ /**/
+
+--
+Yesterday, all my deadlines seemed so far away
+now it looks as though it's freeze in four days
+oh I believe in cvs..
+ [ CVS log "Beatles style" for FreeBSD ports/INDEX, Satoshi Asami ]
+
+ /// 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.034
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.034?rev=724&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.034 (added)
+++ trunk/packages/vim/upstream/patches/7.0.034 Fri Jun 23 18:07:39 2006
@@ -1,0 +1,63 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.034
+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.034
+Problem: After doing completion and typing more characters or using BS
+ repeating with "." didn't work properly. (Martin Stubenschrott)
+Solution: Don't put BS and other characters in the redo buffer right away,
+ do this when finishing completion.
+Files: src/edit.c
+
+
+*** ../vim-7.0.033/src/edit.c Thu Jun 22 16:48:43 2006
+--- src/edit.c Fri Jun 23 17:50:47 2006
+***************
+*** 3020,3028 ****
+ if ((int)(p - line) - (int)compl_col <= 0)
+ return K_BS;
+
+- /* For redo we need to repeat this backspace. */
+- AppendCharToRedobuff(K_BS);
+-
+ /* Deleted more than what was used to find matches or didn't finish
+ * finding all matches: need to look for matches all over again. */
+ if (curwin->w_cursor.col <= compl_col + compl_length
+--- 3020,3025 ----
+***************
+*** 3121,3130 ****
+ else
+ #endif
+ ins_char(c);
+-
+- /* For redo we need to count this character so that the number of
+- * backspaces is correct. */
+- AppendCharToRedobuff(c);
+
+ /* If we didn't complete finding matches we must search again. */
+ if (compl_was_interrupted)
+--- 3118,3123 ----
+*** ../vim-7.0.033/src/version.c Fri Jun 23 17:26:02 2006
+--- src/version.c Fri Jun 23 17:59:04 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 34,
+ /**/
+
+--
+A parent can be arrested if his child cannot hold back a burp during a church
+service.
+ [real standing law in Nebraska, United States of America]
+
+ /// 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