r978 - in /trunk/packages/vim: debian/ patches/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Fri Jun 29 17:44:15 UTC 2007
Author: jamessan
Date: Fri Jun 29 17:44:15 2007
New Revision: 978
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=978
Log:
* New upstream patches (003 - 018)
+ Load all matching files in $VIMRUNTIME when using ":syn include"
(Closes: #395517)
Patch 013 replaces my patch for the issue (syntax.c_syn-include.diff)
Added:
trunk/packages/vim/upstream/patches/7.1.003
trunk/packages/vim/upstream/patches/7.1.004
trunk/packages/vim/upstream/patches/7.1.005
trunk/packages/vim/upstream/patches/7.1.006
trunk/packages/vim/upstream/patches/7.1.007
trunk/packages/vim/upstream/patches/7.1.008
trunk/packages/vim/upstream/patches/7.1.009
trunk/packages/vim/upstream/patches/7.1.010
trunk/packages/vim/upstream/patches/7.1.011
trunk/packages/vim/upstream/patches/7.1.012
trunk/packages/vim/upstream/patches/7.1.013
trunk/packages/vim/upstream/patches/7.1.014
trunk/packages/vim/upstream/patches/7.1.015
trunk/packages/vim/upstream/patches/7.1.016
trunk/packages/vim/upstream/patches/7.1.017
trunk/packages/vim/upstream/patches/7.1.018
Removed:
trunk/packages/vim/patches/syntax.c_syn-include.diff
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
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=978&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Fri Jun 29 17:44:15 2007
@@ -27,3 +27,19 @@
SIZE NAME FIXES
2404 7.1.001 can't build with Gnome GUI
2011 7.1.002 Oracle Pro*C/C++ files are not detected
+ 1529 7.1.003 (extra) Win32: menu entries end up in message history
+ 2481 7.1.004 crash when editing a directory
+ 3841 7.1.005 "cit" used on <foo></foo> deletes <foo>
+ 2941 7.1.006 when reading from stdin 'modified' can't be reset in autocmd
+ 6458 7.1.007 (extra) Mac: context menu does not work, scrollbars not dimmed
+ 2631 7.1.008 getfsize() returns an invalid number for very big files
+ 1881 7.1.009 diff mode: tab to spaces change not highlighted correctly
+ 2796 7.1.010 Gnome: tab pages are not included in the saved session
+ 1934 7.1.011 buffer overflow when $VIMRUNTIME is very long
+ 1904 7.1.012 ":let &tw = 'asdf'" does not give an error message
+ 2139 7.1.013 ":syn include" only loads the first file
+ 1479 7.1.014 crash in C-indenting
+ 3743 7.1.015 MzScheme interface doesn't build on Mac; init problem
+ 2368 7.1.016 (after 7.1.012) error message when using ":cwindow"
+ 6729 7.1.017 ":confirm w" does not give a prompt when file is read-only
+ 1771 7.1.018 "p" at end of line doesn't work right when 've' is set
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=978&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Fri Jun 29 17:44:15 2007
@@ -1,7 +1,9 @@
-vim (1:7.1-002+1) UNRELEASED; urgency=low
+vim (1:7.1-018+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (001 - 002), see README.gz for details.
+ * New upstream patches (001 - 018), see README.gz for details.
+ + Load all matching files in $VIMRUNTIME when using ":syn include"
+ (Closes: #395517)
[ James Vega ]
* Add changelog.vim-date_end_entry.diff, which fixes a variable name which
@@ -9,8 +11,6 @@
* Remove 'viminfo' and 'textwidth' settings from $VIMRUNTIME/debian.vim. We
were uselessly setting 'textwidth' to the default value and 'viminfo' to
an almost-default but less useful value.
- * Add syntax.c_syn-include.diff, which fixes a bug in sourcing runtime files
- when a relative path is given to :syn-include. (Closes: #395517)
* Add Makefile_no-strip.diff, which removes the calls to strip in upstream's
makefile. We'll handle that in debian/rules.
* gvim.desktop should be using %F instead of %U to specify the filename.
@@ -39,7 +39,7 @@
* Add map.vim-syntax.diff which ships syntax file for UMN map server
(Closes: #355900)
- -- Stefano Zacchiroli <zack at debian.org> Sat, 23 Jun 2007 13:51:55 +0100
+ -- James Vega <jamessan at debian.org> Fri, 29 Jun 2007 10:31:34 -0400
vim (1:7.1-000+1) unstable; urgency=low
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=978&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Fri Jun 29 17:44:15 2007
@@ -14,7 +14,6 @@
zh_TW.po-swap_recovery_typo.diff -p0
changelog.vim-date_end_entry.diff -p0
javac_cmdline-vim.diff -p0
-syntax.c_syn-include.diff
Makefile_no-strip.diff
debchangelog-closes_omni.vim.diff
map.vim-syntax.diff
Added: trunk/packages/vim/upstream/patches/7.1.003
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.003?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.003 (added)
+++ trunk/packages/vim/upstream/patches/7.1.003 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,48 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.003 (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.1.003 (extra)
+Problem: The "Tear off this menu" message appears in the message history
+ when using a menu. (Yongwei Wu)
+Solution: Disable message history when displaying the menu tip.
+Files: src/gui_w32.c
+
+
+*** ../vim-7.1.002/src/gui_w32.c Thu May 10 22:17:22 2007
+--- src/gui_w32.c Sat Jun 9 13:43:07 2007
+***************
+*** 1051,1057 ****
+--- 1051,1059 ----
+ if (pMenu != NULL && pMenu->strings[MENU_INDEX_TIP] != 0
+ && GetMenuState(s_menuBar, pMenu->id, MF_BYCOMMAND) != -1)
+ {
++ ++msg_hist_off;
+ msg(pMenu->strings[MENU_INDEX_TIP]);
++ --msg_hist_off;
+ setcursor();
+ out_flush();
+ did_menu_tip = TRUE;
+*** ../vim-7.1.002/src/version.c Tue May 15 09:14:33 2007
+--- src/version.c Tue Jun 19 10:08:17 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 3,
+ /**/
+
+--
+In his lifetime van Gogh painted 486 oil paintings. Oddly enough, 8975
+of them are to be found in the United States.
+
+ /// 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.1.004
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.004?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.004 (added)
+++ trunk/packages/vim/upstream/patches/7.1.004 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,73 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.004
+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.1.004
+Problem: Crash when doing ":next directory". (Raphael Finkel)
+Solution: Do not use "buf", it may be invalid after autocommands.
+Files: src/ex_cmds.c
+
+
+*** ../vim-7.1.003/src/ex_cmds.c Thu May 10 21:24:24 2007
+--- src/ex_cmds.c Mon Jun 18 22:03:56 2007
+***************
+*** 3367,3373 ****
+ * was in this window (or another window). If not used
+ * before, reset the local window options to the global
+ * values. Also restores old folding stuff. */
+! get_winopts(buf);
+ #ifdef FEAT_SPELL
+ did_get_winopts = TRUE;
+ #endif
+--- 3367,3373 ----
+ * was in this window (or another window). If not used
+ * before, reset the local window options to the global
+ * values. Also restores old folding stuff. */
+! get_winopts(curbuf);
+ #ifdef FEAT_SPELL
+ did_get_winopts = TRUE;
+ #endif
+***************
+*** 3649,3656 ****
+ #ifdef FEAT_SPELL
+ /* If the window options were changed may need to set the spell language.
+ * Can only do this after the buffer has been properly setup. */
+! if (did_get_winopts && curwin->w_p_spell && *buf->b_p_spl != NUL)
+! did_set_spelllang(buf);
+ #endif
+
+ if (command == NULL)
+--- 3649,3656 ----
+ #ifdef FEAT_SPELL
+ /* If the window options were changed may need to set the spell language.
+ * Can only do this after the buffer has been properly setup. */
+! if (did_get_winopts && curwin->w_p_spell && *curbuf->b_p_spl != NUL)
+! did_set_spelllang(curbuf);
+ #endif
+
+ if (command == NULL)
+*** ../vim-7.1.003/src/version.c Tue Jun 19 10:09:15 2007
+--- src/version.c Tue Jun 19 11:53:34 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 4,
+ /**/
+
+--
+FIRST HEAD: Oh! quick! get the sword out I want to cut his head off.
+THIRD HEAD: Oh, cut your own head off.
+SECOND HEAD: Yes - do us all a favour.
+ "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 ///
Added: trunk/packages/vim/upstream/patches/7.1.005
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.005?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.005 (added)
+++ trunk/packages/vim/upstream/patches/7.1.005 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,149 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.005
+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.1.005
+Problem: "cit" used on <foo></foo> deletes <foo>. Should not delete
+ anything and start insertion, like "ci'" does on "". (Michal
+ Bozon)
+Solution: Handle an empty object specifically. Made it work consistent for
+ various text objects.
+Files: src/search.c
+
+
+*** ../vim-7.1.004/src/search.c Thu May 10 20:54:46 2007
+--- src/search.c Mon Jun 4 12:31:04 2007
+***************
+*** 3600,3612 ****
+ {
+ oap->start = start_pos;
+ oap->motion_type = MCHAR;
+ if (sol)
+- {
+ incl(&curwin->w_cursor);
+! oap->inclusive = FALSE;
+! }
+! else
+ oap->inclusive = TRUE;
+ }
+
+ return OK;
+--- 3600,3615 ----
+ {
+ oap->start = start_pos;
+ oap->motion_type = MCHAR;
++ oap->inclusive = FALSE;
+ if (sol)
+ incl(&curwin->w_cursor);
+! else if (lt(start_pos, curwin->w_cursor))
+! /* Include the character under the cursor. */
+ oap->inclusive = TRUE;
++ else
++ /* End is before the start (no text in between <>, [], etc.): don't
++ * operate on any text. */
++ curwin->w_cursor = start_pos;
+ }
+
+ return OK;
+***************
+*** 3734,3740 ****
+
+ if (in_html_tag(FALSE))
+ {
+! /* cursor on start tag, move to just after it */
+ while (*ml_get_cursor() != '>')
+ if (inc_cursor() < 0)
+ break;
+--- 3737,3743 ----
+
+ if (in_html_tag(FALSE))
+ {
+! /* cursor on start tag, move to its '>' */
+ while (*ml_get_cursor() != '>')
+ if (inc_cursor() < 0)
+ break;
+***************
+*** 3838,3844 ****
+ /* Exclude the start tag. */
+ curwin->w_cursor = start_pos;
+ while (inc_cursor() >= 0)
+! if (*ml_get_cursor() == '>' && lt(curwin->w_cursor, end_pos))
+ {
+ inc_cursor();
+ start_pos = curwin->w_cursor;
+--- 3841,3847 ----
+ /* Exclude the start tag. */
+ curwin->w_cursor = start_pos;
+ while (inc_cursor() >= 0)
+! if (*ml_get_cursor() == '>')
+ {
+ inc_cursor();
+ start_pos = curwin->w_cursor;
+***************
+*** 3860,3866 ****
+ #ifdef FEAT_VISUAL
+ if (VIsual_active)
+ {
+! if (*p_sel == 'e')
+ ++curwin->w_cursor.col;
+ VIsual = start_pos;
+ VIsual_mode = 'v';
+--- 3863,3873 ----
+ #ifdef FEAT_VISUAL
+ if (VIsual_active)
+ {
+! /* If the end is before the start there is no text between tags, select
+! * the char under the cursor. */
+! if (lt(end_pos, start_pos))
+! curwin->w_cursor = start_pos;
+! else if (*p_sel == 'e')
+ ++curwin->w_cursor.col;
+ VIsual = start_pos;
+ VIsual_mode = 'v';
+***************
+*** 3872,3878 ****
+ {
+ oap->start = start_pos;
+ oap->motion_type = MCHAR;
+! oap->inclusive = TRUE;
+ }
+ retval = OK;
+
+--- 3879,3893 ----
+ {
+ oap->start = start_pos;
+ oap->motion_type = MCHAR;
+! if (lt(end_pos, start_pos))
+! {
+! /* End is before the start: there is no text between tags; operate
+! * on an empty area. */
+! curwin->w_cursor = start_pos;
+! oap->inclusive = FALSE;
+! }
+! else
+! oap->inclusive = TRUE;
+ }
+ retval = OK;
+
+*** ../vim-7.1.004/src/version.c Tue Jun 19 11:54:23 2007
+--- src/version.c Tue Jun 19 12:57:03 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 5,
+ /**/
+
+--
+Life would be so much easier if we could just look at the source code.
+
+ /// 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.1.006
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.006?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.006 (added)
+++ trunk/packages/vim/upstream/patches/7.1.006 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,85 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.006
+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.1.006
+Problem: Resetting 'modified' in a StdinReadPost autocommand doesn't work.
+Solution: Set 'modified' before the autocommands instead of after it.
+Files: src/buffer.c
+
+
+*** ../vim-7.1.005/src/buffer.c Thu May 10 18:43:46 2007
+--- src/buffer.c Fri Jun 8 20:59:04 2007
+***************
+*** 171,176 ****
+--- 171,183 ----
+ /* Put the cursor on the first line. */
+ curwin->w_cursor.lnum = 1;
+ curwin->w_cursor.col = 0;
++
++ /* Set or reset 'modified' before executing autocommands, so that
++ * it can be changed there. */
++ if (!readonlymode && !bufempty())
++ changed();
++ else if (retval != FAIL)
++ unchanged(curbuf, FALSE);
+ #ifdef FEAT_AUTOCMD
+ # ifdef FEAT_EVAL
+ apply_autocmds_retval(EVENT_STDINREADPOST, NULL, NULL, FALSE,
+***************
+*** 194,209 ****
+ /* When reading stdin, the buffer contents always needs writing, so set
+ * the changed flag. Unless in readonly mode: "ls | gview -".
+ * When interrupted and 'cpoptions' contains 'i' set changed flag. */
+! if ((read_stdin && !readonlymode && !bufempty())
+ #ifdef FEAT_AUTOCMD
+ || modified_was_set /* ":set modified" used in autocmd */
+ # ifdef FEAT_EVAL
+ || (aborting() && vim_strchr(p_cpo, CPO_INTMOD) != NULL)
+ # endif
+ #endif
+! || (got_int && vim_strchr(p_cpo, CPO_INTMOD) != NULL))
+ changed();
+! else if (retval != FAIL)
+ unchanged(curbuf, FALSE);
+ save_file_ff(curbuf); /* keep this fileformat */
+
+--- 201,216 ----
+ /* When reading stdin, the buffer contents always needs writing, so set
+ * the changed flag. Unless in readonly mode: "ls | gview -".
+ * When interrupted and 'cpoptions' contains 'i' set changed flag. */
+! if ((got_int && vim_strchr(p_cpo, CPO_INTMOD) != NULL)
+ #ifdef FEAT_AUTOCMD
+ || modified_was_set /* ":set modified" used in autocmd */
+ # ifdef FEAT_EVAL
+ || (aborting() && vim_strchr(p_cpo, CPO_INTMOD) != NULL)
+ # endif
+ #endif
+! )
+ changed();
+! else if (retval != FAIL && !read_stdin)
+ unchanged(curbuf, FALSE);
+ save_file_ff(curbuf); /* keep this fileformat */
+
+*** ../vim-7.1.005/src/version.c Tue Jun 19 12:58:55 2007
+--- src/version.c Tue Jun 19 15:37:53 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 6,
+ /**/
+
+--
+If I tell you "you have a beautiful body", would you hold it against me?
+
+ /// 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.1.007
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.007?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.007 (added)
+++ trunk/packages/vim/upstream/patches/7.1.007 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,221 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.007 (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.1.007 (extra)
+Problem: Mac: Context menu doesn't work on Intel Macs.
+ Scrollbars are not dimmed when Vim is not the active application.
+Solution: Remove the test whether context menus are supported. They are
+ always there in OS/X. Handle the dimming. (Nicolas Weber)
+Files: src/gui_mac.c, src/gui.h
+
+
+*** ../vim-7.1.006/src/gui_mac.c Thu May 10 20:07:25 2007
+--- src/gui_mac.c Sat Jun 9 14:19:25 2007
+***************
+*** 1676,1688 ****
+ /* TODO: NEEDED? */
+ clickIsPopup = FALSE;
+
+! if ((gui.MacOSHaveCntxMenu) && (mouse_model_popup()))
+! if (IsShowContextualMenuClick(theEvent))
+! {
+! vimMouseButton = MOUSE_RIGHT;
+! vimModifiers &= ~MOUSE_CTRL;
+! clickIsPopup = TRUE;
+! }
+
+ /* Is it a double click ? */
+ dblClick = ((theEvent->when - lastMouseTick) < GetDblTime());
+--- 1676,1687 ----
+ /* TODO: NEEDED? */
+ clickIsPopup = FALSE;
+
+! if (mouse_model_popup() && IsShowContextualMenuClick(theEvent))
+! {
+! vimMouseButton = MOUSE_RIGHT;
+! vimModifiers &= ~MOUSE_CTRL;
+! clickIsPopup = TRUE;
+! }
+
+ /* Is it a double click ? */
+ dblClick = ((theEvent->when - lastMouseTick) < GetDblTime());
+***************
+*** 1920,1943 ****
+ WindowPtr whichWindow;
+
+ whichWindow = (WindowPtr) event->message;
+! if ((event->modifiers) & activeFlag)
+! /* Activate */
+! gui_focus_change(TRUE);
+! else
+ {
+! /* Deactivate */
+! gui_focus_change(FALSE);
+! /* DON'T KNOW what the code below was doing
+! found in the deactivate clause, but the
+! clause writing TRUE into in_focus (BUG)
+! */
+!
+! #if 0 /* Removed by Dany as per above June 2001 */
+! a_bool = false;
+! SetPreserveGlyph(a_bool);
+! SetOutlinePreferred(a_bool);
+! #endif
+ }
+ }
+
+
+--- 1919,1937 ----
+ WindowPtr whichWindow;
+
+ whichWindow = (WindowPtr) event->message;
+! /* Dim scrollbars */
+! if (whichWindow == gui.VimWindow)
+ {
+! ControlRef rootControl;
+! GetRootControl(gui.VimWindow, &rootControl);
+! if ((event->modifiers) & activeFlag)
+! ActivateControl(rootControl);
+! else
+! DeactivateControl(rootControl);
+ }
++
++ /* Activate */
++ gui_focus_change((event->modifiers) & activeFlag);
+ }
+
+
+***************
+*** 2559,2574 ****
+ OSErr error;
+
+ /* Handle contextual menu right now (if needed) */
+! if (gui.MacOSHaveCntxMenu)
+! if (IsShowContextualMenuClick(event))
+! {
+ # if 0
+! gui_mac_handle_contextual_menu(event);
+ # else
+! gui_mac_doMouseDownEvent(event);
+ # endif
+! return;
+! }
+
+ /* Handle normal event */
+ switch (event->what)
+--- 2553,2567 ----
+ OSErr error;
+
+ /* Handle contextual menu right now (if needed) */
+! if (IsShowContextualMenuClick(event))
+! {
+ # if 0
+! gui_mac_handle_contextual_menu(event);
+ # else
+! gui_mac_doMouseDownEvent(event);
+ # endif
+! return;
+! }
+
+ /* Handle normal event */
+ switch (event->what)
+***************
+*** 2782,2795 ****
+ (void) InstallAEHandlers();
+ #endif
+
+- if (Gestalt(gestaltContextualMenuAttr, &gestalt_rc) == noErr)
+- gui.MacOSHaveCntxMenu = BitTst(&gestalt_rc, 31-gestaltContextualMenuTrapAvailable);
+- else
+- gui.MacOSHaveCntxMenu = false;
+-
+- if (gui.MacOSHaveCntxMenu)
+- gui.MacOSHaveCntxMenu = (InitContextualMenus()==noErr);
+-
+ pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */
+
+ AppendMenu(pomme, "\pAbout VIM");
+--- 2775,2780 ----
+***************
+*** 2941,2946 ****
+--- 2926,2932 ----
+ #ifdef USE_CARBONKEYHANDLER
+ EventHandlerRef keyEventHandlerRef;
+ #endif
++ ControlRef rootControl;
+
+ if (Gestalt(gestaltSystemVersion, &gMacSystemVersion) != noErr)
+ gMacSystemVersion = 0x1000; /* TODO: Default to minimum sensible value */
+***************
+*** 2954,2968 ****
+ (void) InstallAEHandlers();
+ #endif
+
+- /* Ctrl click */
+- if (Gestalt(gestaltContextualMenuAttr, &gestalt_rc) == noErr)
+- gui.MacOSHaveCntxMenu = BitTst(&gestalt_rc, 31-gestaltContextualMenuTrapAvailable);
+- else
+- gui.MacOSHaveCntxMenu = false;
+-
+- if (gui.MacOSHaveCntxMenu)
+- gui.MacOSHaveCntxMenu = (InitContextualMenus()==noErr);
+-
+ pomme = NewMenu(256, "\p\024"); /* 0x14= = Apple Menu */
+
+ AppendMenu(pomme, "\pAbout VIM");
+--- 2940,2945 ----
+***************
+*** 2981,2986 ****
+--- 2958,2964 ----
+ gui.VimWindow = NewCWindow(nil, &windRect, "\pgVim on Macintosh", true,
+ zoomDocProc,
+ (WindowPtr)-1L, true, 0);
++ CreateRootControl(gui.VimWindow, &rootControl);
+ InstallReceiveHandler((DragReceiveHandlerUPP)receiveHandler,
+ gui.VimWindow, NULL);
+ SetPortWindowPort(gui.VimWindow);
+*** ../vim-7.1.006/src/gui.h Thu May 10 19:18:46 2007
+--- src/gui.h Sat Jun 9 14:10:34 2007
+***************
+*** 460,466 ****
+ WindowPtr VimWindow;
+ MenuHandle MacOSHelpMenu; /* Help menu provided by the MacOS */
+ int MacOSHelpItems; /* Nr of help-items supplied by MacOS */
+- int MacOSHaveCntxMenu; /* Contextual menu available */
+ WindowPtr wid; /* Window id of text area */
+ int visibility; /* Is window partially/fully obscured? */
+ #endif
+--- 460,465 ----
+*** ../vim-7.1.006/src/version.c Tue Jun 19 15:40:51 2007
+--- src/version.c Tue Jun 19 15:44:15 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 7,
+ /**/
+
+--
+ When danger reared its ugly head,
+ He bravely turned his tail and fled
+ Yes, Brave Sir Robin turned about
+ And gallantly he chickened out
+ Bravely taking to his feet
+ He beat a very brave retreat
+ Bravest of the brave Sir Robin
+ Petrified of being dead
+ Soiled his pants then brave Sir Robin
+ Turned away and fled.
+ "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 ///
Added: trunk/packages/vim/upstream/patches/7.1.008
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.008?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.008 (added)
+++ trunk/packages/vim/upstream/patches/7.1.008 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,82 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.008 (correction
+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
+------------
+
+Oops, forgot the src/version.c change.
+
+Patch 7.1.008
+Problem: getfsize() returns a negative number for very big files.
+Solution: Check for overflow and return -2.
+Files: runtime/doc/eval.txt, src/eval.c
+
+
+*** ../vim-7.1.007/runtime/doc/eval.txt Sat May 12 16:38:23 2007
+--- runtime/doc/eval.txt Sat Jun 9 15:48:40 2007
+***************
+*** 1,4 ****
+! *eval.txt* For Vim version 7.1. Last change: 2007 May 11
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+--- 1,4 ----
+! *eval.txt* For Vim version 7.1. Last change: 2007 Jun 09
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+***************
+*** 2824,2829 ****
+--- 2824,2831 ----
+ given file {fname}.
+ If {fname} is a directory, 0 is returned.
+ If the file {fname} can't be found, -1 is returned.
++ If the size of {fname} is too big to fit in a Number then -2
++ is returned.
+
+ getfontname([{name}]) *getfontname()*
+ Without an argument returns the name of the normal font being
+*** ../vim-7.1.007/src/eval.c Thu May 10 21:30:00 2007
+--- src/eval.c Sat Jun 9 15:46:46 2007
+***************
+*** 10136,10142 ****
+--- 10136,10148 ----
+ if (mch_isdir(fname))
+ rettv->vval.v_number = 0;
+ else
++ {
+ rettv->vval.v_number = (varnumber_T)st.st_size;
++
++ /* non-perfect check for overflow */
++ if ((off_t)rettv->vval.v_number != (off_t)st.st_size)
++ rettv->vval.v_number = -2;
++ }
+ }
+ else
+ rettv->vval.v_number = -1;
+*** ../vim-7.1.007/src/version.c Tue Jun 19 16:33:53 2007
+--- src/version.c Tue Jun 19 17:30:50 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 8,
+ /**/
+
+
+--
+ZOOT: I'm afraid our life must seem very dull and quiet compared to yours.
+ We are but eightscore young blondes, all between sixteen and
+ nineteen-and-a-half, cut off in this castle, with no one to protect us.
+ Oooh. It is a lonely life ... bathing ... dressing ... undressing ...
+ making exciting underwear....
+ "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 ///
Added: trunk/packages/vim/upstream/patches/7.1.009
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.009?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.009 (added)
+++ trunk/packages/vim/upstream/patches/7.1.009 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,58 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.009
+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.1.009
+Problem: In diff mode, displaying the difference between a tab and spaces
+ is not highlighted correctly.
+Solution: Only change highlighting at the end of displaying a tab.
+Files: src/screen.c
+
+
+*** ../vim-7.1.008/src/screen.c Thu May 10 20:15:31 2007
+--- src/screen.c Mon Jun 11 21:49:44 2007
+***************
+*** 3459,3467 ****
+ #ifdef FEAT_DIFF
+ if (diff_hlf != (hlf_T)0)
+ {
+! if (diff_hlf == HLF_CHD && ptr - line >= change_start)
+ diff_hlf = HLF_TXD; /* changed text */
+! if (diff_hlf == HLF_TXD && ptr - line > change_end)
+ diff_hlf = HLF_CHD; /* changed line */
+ line_attr = hl_attr(diff_hlf);
+ }
+--- 3459,3469 ----
+ #ifdef FEAT_DIFF
+ if (diff_hlf != (hlf_T)0)
+ {
+! if (diff_hlf == HLF_CHD && ptr - line >= change_start
+! && n_extra == 0)
+ diff_hlf = HLF_TXD; /* changed text */
+! if (diff_hlf == HLF_TXD && ptr - line > change_end
+! && n_extra == 0)
+ diff_hlf = HLF_CHD; /* changed line */
+ line_attr = hl_attr(diff_hlf);
+ }
+*** ../vim-7.1.008/src/version.c Tue Jun 19 17:33:52 2007
+--- src/version.c Tue Jun 19 17:36:36 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 9,
+ /**/
+
+--
+Linux is just like a wigwam: no Windows, no Gates and an Apache inside.
+
+ /// 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.1.010
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.010?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.010 (added)
+++ trunk/packages/vim/upstream/patches/7.1.010 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,75 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.010
+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.1.010
+Problem: The Gnome session file doesn't restore tab pages.
+Solution: Add SSOP_TABPAGES to the session flags. (Matias D'Ambrosio)
+Files: src/gui_gtk_x11.c
+
+
+*** ../vim-7.1.009/src/gui_gtk_x11.c Mon May 14 19:35:51 2007
+--- src/gui_gtk_x11.c Sat Jun 9 16:54:13 2007
+***************
+*** 2188,2195 ****
+ escaped_filename = vim_strsave_escaped(filename, escape_chars);
+ if (escaped_filename == NULL)
+ return FALSE;
+! mksession_cmdline = g_strconcat("mksession ", (char *)escaped_filename, NULL);
+ vim_free(escaped_filename);
+ /*
+ * Use a reasonable hardcoded set of 'sessionoptions' flags to avoid
+ * unpredictable effects when the session is saved automatically. Also,
+--- 2188,2197 ----
+ escaped_filename = vim_strsave_escaped(filename, escape_chars);
+ if (escaped_filename == NULL)
+ return FALSE;
+! mksession_cmdline = g_strconcat("mksession ", (char *)escaped_filename,
+! NULL);
+ vim_free(escaped_filename);
++
+ /*
+ * Use a reasonable hardcoded set of 'sessionoptions' flags to avoid
+ * unpredictable effects when the session is saved automatically. Also,
+***************
+*** 2199,2205 ****
+ */
+ save_ssop_flags = ssop_flags;
+ ssop_flags = (SSOP_BLANK|SSOP_CURDIR|SSOP_FOLDS|SSOP_GLOBALS
+! |SSOP_HELP|SSOP_OPTIONS|SSOP_WINSIZE);
+
+ do_cmdline_cmd((char_u *)"let Save_VV_this_session = v:this_session");
+ failed = (do_cmdline_cmd((char_u *)mksession_cmdline) == FAIL);
+--- 2201,2207 ----
+ */
+ save_ssop_flags = ssop_flags;
+ ssop_flags = (SSOP_BLANK|SSOP_CURDIR|SSOP_FOLDS|SSOP_GLOBALS
+! |SSOP_HELP|SSOP_OPTIONS|SSOP_WINSIZE|SSOP_TABPAGES);
+
+ do_cmdline_cmd((char_u *)"let Save_VV_this_session = v:this_session");
+ failed = (do_cmdline_cmd((char_u *)mksession_cmdline) == FAIL);
+*** ../vim-7.1.009/src/version.c Tue Jun 19 17:49:12 2007
+--- src/version.c Tue Jun 19 18:07:09 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 10,
+ /**/
+
+--
+GALAHAD: No look, really, this isn't nescess ...
+PIGLET: We must examine you.
+GALAHAD: There's nothing wrong with ... that.
+ "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 ///
Added: trunk/packages/vim/upstream/patches/7.1.011
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.011?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.011 (added)
+++ trunk/packages/vim/upstream/patches/7.1.011 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,58 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.011
+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.1.011
+Problem: Possible buffer overflow when $VIMRUNTIME is very long. (Victor
+ Stinner)
+Solution: Use vim_snprintf().
+Files: src/main.c
+
+
+*** ../vim-7.1.010/src/main.c Thu May 10 21:12:25 2007
+--- src/main.c Sat Jun 9 22:37:46 2007
+***************
+*** 1360,1367 ****
+ p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
+ if (p != NULL && *p != NUL)
+ {
+! STRCPY(NameBuff, p);
+! STRCAT(NameBuff, "/lang");
+ bindtextdomain(VIMPACKAGE, (char *)NameBuff);
+ }
+ if (mustfree)
+--- 1360,1366 ----
+ p = vim_getenv((char_u *)"VIMRUNTIME", &mustfree);
+ if (p != NULL && *p != NUL)
+ {
+! vim_snprintf((char *)NameBuff, MAXPATHL, "%s/lang", p);
+ bindtextdomain(VIMPACKAGE, (char *)NameBuff);
+ }
+ if (mustfree)
+*** ../vim-7.1.010/src/version.c Tue Jun 19 18:07:52 2007
+--- src/version.c Tue Jun 19 20:29:44 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 11,
+ /**/
+
+--
+ GALAHAD hurries to the door and pushes through it. As he leaves the room
+ we CUT TO the reverse to show that he is now in a room full of bathing
+ and romping GIRLIES, all innocent, wide-eyed and beautiful. They smile
+ enchantingly at him as he tries to keep walking without being diverted by
+ the lovely sights assaulting his eyeballs.
+ "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 ///
Added: trunk/packages/vim/upstream/patches/7.1.012
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.012?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.012 (added)
+++ trunk/packages/vim/upstream/patches/7.1.012 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,62 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.012
+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.1.012
+Problem: ":let &shiftwidth = 'asdf'" doesn't produce an error message.
+Solution: Check for a string argument. (Chris Lubinski)
+Files: src/option.c
+
+
+*** ../vim-7.1.011/src/option.c Sun May 6 15:37:32 2007
+--- src/option.c Tue Jun 19 20:56:36 2007
+***************
+*** 8219,8224 ****
+--- 8219,8243 ----
+ varp = get_varp(&options[opt_idx]);
+ if (varp != NULL) /* hidden option is not changed */
+ {
++ if (number == 0 && string != NULL)
++ {
++ int index;
++
++ /* Either we are given a string or we are setting option
++ * to zero. */
++ for (index = 0; string[index] == '0'; ++index)
++ ;
++ if (string[index] != NUL || index == 0)
++ {
++ /* There's another character after zeros or the string
++ * is empty. In both cases, we are trying to set a
++ * num option using a string. */
++ EMSG3(_("E521: Number required: &%s = '%s'"),
++ name, string);
++ return; /* do nothing as we hit an error */
++
++ }
++ }
+ if (flags & P_NUM)
+ (void)set_num_option(opt_idx, varp, number,
+ NULL, 0, opt_flags);
+*** ../vim-7.1.011/src/version.c Tue Jun 19 20:30:46 2007
+--- src/version.c Tue Jun 19 20:53:15 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 12,
+ /**/
+
+--
+Ten million Linux users can't be wrong!
+
+ /// 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.1.013
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.013?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.013 (added)
+++ trunk/packages/vim/upstream/patches/7.1.013 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,60 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.013
+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.1.013
+Problem: ":syn include" only loads the first file, while it is documented
+ as doing the equivalent of ":runtime!".
+Solution: Change the argument to source_runtime(). (James Vega)
+Files: src/syntax.c
+
+
+*** ../vim-7.1.012/src/syntax.c Thu May 10 20:54:33 2007
+--- src/syntax.c Sun Jun 17 22:03:30 2007
+***************
+*** 4460,4467 ****
+ current_syn_inc_tag = ++running_syn_inc_tag;
+ prev_toplvl_grp = curbuf->b_syn_topgrp;
+ curbuf->b_syn_topgrp = sgl_id;
+! if (source ? do_source(eap->arg, FALSE, FALSE) == FAIL
+! : source_runtime(eap->arg, DOSO_NONE) == FAIL)
+ EMSG2(_(e_notopen), eap->arg);
+ curbuf->b_syn_topgrp = prev_toplvl_grp;
+ current_syn_inc_tag = prev_syn_inc_tag;
+--- 4460,4467 ----
+ current_syn_inc_tag = ++running_syn_inc_tag;
+ prev_toplvl_grp = curbuf->b_syn_topgrp;
+ curbuf->b_syn_topgrp = sgl_id;
+! if (source ? do_source(eap->arg, FALSE, DOSO_NONE) == FAIL
+! : source_runtime(eap->arg, TRUE) == FAIL)
+ EMSG2(_(e_notopen), eap->arg);
+ curbuf->b_syn_topgrp = prev_toplvl_grp;
+ current_syn_inc_tag = prev_syn_inc_tag;
+*** ../vim-7.1.012/src/version.c Tue Jun 19 20:56:52 2007
+--- src/version.c Thu Jun 28 11:58:25 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 13,
+ /**/
+
+--
+MORTICIAN: What?
+CUSTOMER: Nothing -- here's your nine pence.
+DEAD PERSON: I'm not dead!
+MORTICIAN: Here -- he says he's not dead!
+CUSTOMER: Yes, he is.
+DEAD PERSON: I'm not!
+ The Quest for the Holy Grail (Monty Python)
+
+ /// 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.1.014
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.014?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.014 (added)
+++ trunk/packages/vim/upstream/patches/7.1.014 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,46 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.014
+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.1.014
+Problem: Crash when doing C indenting. (Chris Monson)
+Solution: Obtain the current line again after invoking cin_islabel().
+Files: src/edit.c
+
+
+*** ../vim-7.1.013/src/edit.c Thu May 10 20:44:18 2007
+--- src/edit.c Wed Jun 20 18:25:54 2007
+***************
+*** 7215,7220 ****
+--- 7215,7222 ----
+ p = ml_get_curline();
+ if (cin_iscase(p) || cin_isscopedecl(p) || cin_islabel(30))
+ return TRUE;
++ /* Need to get the line again after cin_islabel(). */
++ p = ml_get_curline();
+ if (curwin->w_cursor.col > 2
+ && p[curwin->w_cursor.col - 1] == ':'
+ && p[curwin->w_cursor.col - 2] == ':')
+*** ../vim-7.1.013/src/version.c Thu Jun 28 11:59:13 2007
+--- src/version.c Thu Jun 28 12:26:52 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 14,
+ /**/
+
+--
+Have you heard about the new Barbie doll? It's called Divorce
+Barbie. It comes with all of Ken's stuff.
+
+ /// 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.1.015
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.015?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.015 (added)
+++ trunk/packages/vim/upstream/patches/7.1.015 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,97 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.015
+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.1.015
+Problem: MzScheme interface: current-library-collection-paths produces no
+ list. Interface doesn't build on a Mac.
+Solution: Use a list instead of a pair. (Bernhard Fisseni) Use "-framework"
+ argument for MZSCHEME_LIBS in configure.
+Files: src/configure.in, src/if_mzsch.c, src/auto/configure
+
+
+*** ../vim-7.1.014/src/configure.in Sat May 12 16:30:49 2007
+--- src/configure.in Sun Jun 10 16:47:43 2007
+***************
+*** 423,429 ****
+ fi
+
+ if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
+! if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+ else
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+--- 423,431 ----
+ fi
+
+ if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
+! if test "x$MACOSX" = "xyes"; then
+! MZSCHEME_LIBS="-framework PLT_MzScheme"
+! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+ else
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+*** ../vim-7.1.014/src/if_mzsch.c Sat May 12 17:29:20 2007
+--- src/if_mzsch.c Sun Jun 10 16:39:51 2007
+***************
+*** 773,780 ****
+ #ifdef MZSCHEME_COLLECTS
+ /* setup 'current-library-collection-paths' parameter */
+ scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
+! scheme_make_pair(scheme_make_string(MZSCHEME_COLLECTS),
+! scheme_null));
+ #endif
+ #ifdef HAVE_SANDBOX
+ /* setup sandbox guards */
+--- 773,779 ----
+ #ifdef MZSCHEME_COLLECTS
+ /* setup 'current-library-collection-paths' parameter */
+ scheme_set_param(scheme_config, MZCONFIG_COLLECTION_PATHS,
+! scheme_build_list(0, scheme_make_string(MZSCHEME_COLLECTS)));
+ #endif
+ #ifdef HAVE_SANDBOX
+ /* setup sandbox guards */
+*** ../vim-7.1.014/src/auto/configure Sat May 12 16:23:27 2007
+--- src/auto/configure Sun Jun 10 16:49:58 2007
+***************
+*** 3843,3849 ****
+ fi
+
+ if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
+! if test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+ else
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+--- 3843,3851 ----
+ fi
+
+ if test "X$vi_cv_path_mzscheme_pfx" != "X"; then
+! if test "x$MACOSX" = "xyes"; then
+! MZSCHEME_LIBS="-framework PLT_MzScheme"
+! elif test -f "${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"; then
+ MZSCHEME_LIBS="${vi_cv_path_mzscheme_pfx}/lib/libmzscheme.a ${vi_cv_path_mzscheme_pfx}/lib/libmzgc.a"
+ else
+ MZSCHEME_LIBS="-L${vi_cv_path_mzscheme_pfx}/lib -lmzscheme -lmzgc"
+*** ../vim-7.1.014/src/version.c Thu Jun 28 12:44:56 2007
+--- src/version.c Thu Jun 28 13:00:52 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 15,
+ /**/
+
+--
+You know you use Vim too much when you have this alias in your
+~/.bashrc file: alias :e=/bin/vim (Eljay Love-Jensen)
+
+ /// 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.1.016
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.016?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.016 (added)
+++ trunk/packages/vim/upstream/patches/7.1.016 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,72 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.016
+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.1.016 (after patch 7.1.012)
+Problem: Error message about setting 'diff' to a string.
+Solution: Don't pass an empty string to set_option_value() when setting
+ 'diff'.
+Files: src/quickfix.c, src/popupmnu.c
+
+
+*** ../vim-7.1.015/src/quickfix.c Sun Feb 4 02:58:00 2007
+--- src/quickfix.c Thu Jun 28 18:56:16 2007
+***************
+*** 2331,2337 ****
+ set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
+ OPT_LOCAL);
+ set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
+! set_option_value((char_u *)"diff", 0L, (char_u *)"", OPT_LOCAL);
+ }
+
+ /* Only set the height when still in the same tab page and there is no
+--- 2331,2337 ----
+ set_option_value((char_u *)"bt", 0L, (char_u *)"quickfix",
+ OPT_LOCAL);
+ set_option_value((char_u *)"bh", 0L, (char_u *)"wipe", OPT_LOCAL);
+! set_option_value((char_u *)"diff", 0L, NULL, OPT_LOCAL);
+ }
+
+ /* Only set the height when still in the same tab page and there is no
+*** ../vim-7.1.015/src/popupmnu.c Tue Mar 27 12:42:05 2007
+--- src/popupmnu.c Thu Jun 28 19:00:51 2007
+***************
+*** 466,472 ****
+ set_option_value((char_u *)"bh", 0L,
+ (char_u *)"wipe", OPT_LOCAL);
+ set_option_value((char_u *)"diff", 0L,
+! (char_u *)"", OPT_LOCAL);
+ }
+ }
+ if (res == OK)
+--- 466,472 ----
+ set_option_value((char_u *)"bh", 0L,
+ (char_u *)"wipe", OPT_LOCAL);
+ set_option_value((char_u *)"diff", 0L,
+! NULL, OPT_LOCAL);
+ }
+ }
+ if (res == OK)
+*** ../vim-7.1.015/src/version.c Thu Jun 28 13:02:22 2007
+--- src/version.c Thu Jun 28 21:20:20 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 16,
+ /**/
+
+--
+We do not stumble over mountains, but over molehills.
+ Confucius
+
+ /// 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.1.017
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.017?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.017 (added)
+++ trunk/packages/vim/upstream/patches/7.1.017 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,212 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.017
+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.1.017
+Problem: ":confirm w" does give a prompt when 'readonly' is set, but not
+ when the file permissions are read-only. (Michael Schaap)
+Solution: Provide a dialog in both situations. (Chris Lubinski)
+Files: src/ex_cmds.c, src/fileio.c, src/proto/fileio.pro
+
+
+*** ../vim-7.1.016/src/ex_cmds.c Tue Jun 19 11:54:23 2007
+--- src/ex_cmds.c Tue Jun 19 22:37:25 2007
+***************
+*** 2912,2933 ****
+ }
+
+ /*
+! * Check if a buffer is read-only. Ask for overruling in a dialog.
+! * Return TRUE and give an error message when the buffer is readonly.
+ */
+ static int
+ check_readonly(forceit, buf)
+ int *forceit;
+ buf_T *buf;
+ {
+! if (!*forceit && buf->b_p_ro)
+ {
+ #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
+ if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL)
+ {
+ char_u buff[IOSIZE];
+
+! dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"),
+ buf->b_fname);
+
+ if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) == VIM_YES)
+--- 2912,2946 ----
+ }
+
+ /*
+! * Check if a buffer is read-only (either 'readonly' option is set or file is
+! * read-only). Ask for overruling in a dialog. Return TRUE and give an error
+! * message when the buffer is readonly.
+ */
+ static int
+ check_readonly(forceit, buf)
+ int *forceit;
+ buf_T *buf;
+ {
+! struct stat st;
+!
+! /* Handle a file being readonly when the 'readonly' option is set or when
+! * the file exists and permissions are read-only.
+! * We will send 0777 to check_file_readonly(), as the "perm" variable is
+! * important for device checks but not here. */
+! if (!*forceit && (buf->b_p_ro
+! || (mch_stat((char *)buf->b_ffname, &st) >= 0
+! && check_file_readonly(buf->b_ffname, 0777))))
+ {
+ #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
+ if ((p_confirm || cmdmod.confirm) && buf->b_fname != NULL)
+ {
+ char_u buff[IOSIZE];
+
+! if (buf->b_p_ro)
+! dialog_msg(buff, _("'readonly' option is set for \"%s\".\nDo you wish to write anyway?"),
+! buf->b_fname);
+! else
+! dialog_msg(buff, _("File permissions of \"%s\" are read-only.\nIt may still be possible to write it.\nDo you wish to try?"),
+ buf->b_fname);
+
+ if (vim_dialog_yesno(VIM_QUESTION, NULL, buff, 2) == VIM_YES)
+***************
+*** 2941,2949 ****
+--- 2954,2967 ----
+ }
+ else
+ #endif
++ if (buf->b_p_ro)
+ EMSG(_(e_readonly));
++ else
++ EMSG2(_("E505: \"%s\" is read-only (add ! to override)"),
++ buf->b_fname);
+ return TRUE;
+ }
++
+ return FALSE;
+ }
+
+*** ../vim-7.1.016/src/fileio.c Thu May 10 19:32:17 2007
+--- src/fileio.c Thu Jun 28 21:54:18 2007
+***************
+*** 424,430 ****
+ */
+ if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE)
+ {
+! filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option"), 0);
+ msg_end();
+ msg_scroll = msg_save;
+ return FAIL;
+--- 424,430 ----
+ */
+ if (!p_odev && mch_nodetype(fname) == NODE_WRITABLE)
+ {
+! filemess(curbuf, fname, (char_u *)_("is a device (disabled with 'opendevice' option)"), 0);
+ msg_end();
+ msg_scroll = msg_save;
+ return FAIL;
+***************
+*** 2734,2739 ****
+--- 2734,2765 ----
+ #endif
+
+ /*
++ * Return TRUE if a file appears to be read-only from the file permissions.
++ */
++ int
++ check_file_readonly(fname, perm)
++ char_u *fname; /* full path to file */
++ int perm; /* known permissions on file */
++ {
++ #ifndef USE_MCH_ACCESS
++ int fd = 0;
++ #endif
++
++ return (
++ #ifdef USE_MCH_ACCESS
++ # ifdef UNIX
++ (perm & 0222) == 0 ||
++ # endif
++ mch_access((char *)fname, W_OK)
++ #else
++ (fd = mch_open((char *)fname, O_RDWR | O_EXTRA, 0)) < 0
++ ? TRUE : (close(fd), FALSE)
++ #endif
++ );
++ }
++
++
++ /*
+ * buf_write() - write to file "fname" lines "start" through "end"
+ *
+ * We do our own buffering here because fwrite() is so slow.
+***************
+*** 3219,3235 ****
+ * Check if the file is really writable (when renaming the file to
+ * make a backup we won't discover it later).
+ */
+! file_readonly = (
+! # ifdef USE_MCH_ACCESS
+! # ifdef UNIX
+! (perm & 0222) == 0 ||
+! # endif
+! mch_access((char *)fname, W_OK)
+! # else
+! (fd = mch_open((char *)fname, O_RDWR | O_EXTRA, 0)) < 0
+! ? TRUE : (close(fd), FALSE)
+! # endif
+! );
+ if (!forceit && file_readonly)
+ {
+ if (vim_strchr(p_cpo, CPO_FWRITE) != NULL)
+--- 3245,3252 ----
+ * Check if the file is really writable (when renaming the file to
+ * make a backup we won't discover it later).
+ */
+! file_readonly = check_file_readonly(fname, (int)perm);
+!
+ if (!forceit && file_readonly)
+ {
+ if (vim_strchr(p_cpo, CPO_FWRITE) != NULL)
+*** ../vim-7.1.016/src/proto/fileio.pro Sat May 5 19:59:00 2007
+--- src/proto/fileio.pro Thu Jun 28 21:09:59 2007
+***************
+*** 2,7 ****
+--- 2,8 ----
+ void filemess __ARGS((buf_T *buf, char_u *name, char_u *s, int attr));
+ int readfile __ARGS((char_u *fname, char_u *sfname, linenr_T from, linenr_T lines_to_skip, linenr_T lines_to_read, exarg_T *eap, int flags));
+ int prep_exarg __ARGS((exarg_T *eap, buf_T *buf));
++ int check_file_readonly __ARGS((char_u *fname, int perm));
+ int buf_write __ARGS((buf_T *buf, char_u *fname, char_u *sfname, linenr_T start, linenr_T end, exarg_T *eap, int append, int forceit, int reset_changed, int filtering));
+ void msg_add_fname __ARGS((buf_T *buf, char_u *fname));
+ void msg_add_lines __ARGS((int insert_space, long lnum, long nchars));
+*** ../vim-7.1.016/src/version.c Thu Jun 28 21:23:52 2007
+--- src/version.c Thu Jun 28 21:49:29 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 17,
+ /**/
+
+--
+CUSTOMER: Well, can you hang around a couple of minutes? He won't be
+ long.
+MORTICIAN: Naaah, I got to go on to Robinson's -- they've lost nine today.
+CUSTOMER: Well, when is your next round?
+MORTICIAN: Thursday.
+DEAD PERSON: I think I'll go for a walk.
+ The Quest for the Holy Grail (Monty Python)
+
+ /// 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.1.018
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.018?rev=978&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.018 (added)
+++ trunk/packages/vim/upstream/patches/7.1.018 Fri Jun 29 17:44:15 2007
@@ -1,0 +1,60 @@
+To: vim-dev at vim.org
+Subject: patch 7.1.018
+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.1.018
+Problem: When 'virtualedit' is set a "p" of a block just past the end of
+ the line inserts before the cursor. (Engelke)
+Solution: Check for the cursor being just after the line (Chris Lubinski)
+Files: src/ops.c
+
+
+*** ../vim-7.1.017/src/ops.c Thu May 10 20:34:55 2007
+--- src/ops.c Tue Jun 19 22:40:45 2007
+***************
+*** 3404,3410 ****
+
+ #ifdef FEAT_VIRTUALEDIT
+ col += curwin->w_cursor.coladd;
+! if (ve_flags == VE_ALL && curwin->w_cursor.coladd > 0)
+ {
+ if (dir == FORWARD && c == NUL)
+ ++col;
+--- 3404,3412 ----
+
+ #ifdef FEAT_VIRTUALEDIT
+ col += curwin->w_cursor.coladd;
+! if (ve_flags == VE_ALL
+! && (curwin->w_cursor.coladd > 0
+! || endcol2 == curwin->w_cursor.col))
+ {
+ if (dir == FORWARD && c == NUL)
+ ++col;
+*** ../vim-7.1.017/src/version.c Thu Jun 28 21:57:08 2007
+--- src/version.c Thu Jun 28 22:12:49 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 18,
+ /**/
+
+--
+ [clop clop]
+MORTICIAN: Who's that then?
+CUSTOMER: I don't know.
+MORTICIAN: Must be a king.
+CUSTOMER: Why?
+MORTICIAN: He hasn't got shit all over him.
+ The Quest for the Holy Grail (Monty Python)
+
+ /// 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