r762 - in /trunk/packages/vim: debian/ upstream/patches/
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Sat Sep 9 14:17:18 UTC 2006
Author: zack
Date: Sat Sep 9 14:17:16 2006
New Revision: 762
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=762
Log:
- upstream patches up to 094
- added script get_patches.py to automate downloading of latest upstream
patches; it should be invoked from the upstream/patches/ directory
Added:
trunk/packages/vim/upstream/patches/7.0.084
trunk/packages/vim/upstream/patches/7.0.085
trunk/packages/vim/upstream/patches/7.0.086
trunk/packages/vim/upstream/patches/7.0.087
trunk/packages/vim/upstream/patches/7.0.088
trunk/packages/vim/upstream/patches/7.0.089
trunk/packages/vim/upstream/patches/7.0.090
trunk/packages/vim/upstream/patches/7.0.091
trunk/packages/vim/upstream/patches/7.0.092
trunk/packages/vim/upstream/patches/7.0.093
trunk/packages/vim/upstream/patches/7.0.094
trunk/packages/vim/upstream/patches/get_patches.py (with props)
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=762&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sat Sep 9 14:17:16 2006
@@ -108,3 +108,14 @@
2043 7.0.081 command line completion doesn't work for ":!/path"
2850 7.0.082 crash when using List or Dict argument and waiting for input
3001 7.0.083 mouse doesn't work for all entries with inputlist()
+ 5968 7.0.084 garbage collection may free Lists and Dicts still in use
+ 1512 7.0.085 running tests changes the viminfo file
+ 2379 7.0.086 getqflist() uses number zero for empty pattern and text
+ 7382 7.0.087 'acd' doesn't work for ":file fname" and ":saveas fname"
+ 3066 7.0.088 generated prototypes have "extern" when build with Perl
+ 2445 7.0.089 "ga" gave wrong results for non-Unicode multi-byte encoding
+ 2486 7.0.090 need to type Esc twice in console confirm() dialog
+ 1698 7.0.091 winrestview() may leave cursor in the wrong position
+ 2952 7.0.092 (after 7.0.082) list of internal function args is obsolete
+ 2320 7.0.093 matchparen plugin can't handle some values of 'matchpairs'
+ 2394 7.0.094 fileinfo message is given too often after ":buf N"
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=762&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Sep 9 14:17:16 2006
@@ -1,7 +1,7 @@
vim (1:7.0-076+1) UNRELEASED; urgency=medium
[ Debian Vim Maintainers ]
- * New upstream patches (036 - 083), see README.gz for details.
+ * New upstream patches (036 - 094), see README.gz for details.
* Urgency medium because of the fix to vim-lesstif's crash bug.
[ James Vega ]
@@ -22,6 +22,8 @@
* Added patches/filetype.vim-better_tex_vs_plaintex.diff, implementing
better recognition of tex vs plaintex filetype (namely it recognizes as
latex files containing sectioning commands). (closes: #384479)
+ * Added script upstream/patches/get_patches.py to automate downloading of
+ latest upstream patches.
-- James Vega <jamessan at debian.org> Wed, 30 Aug 2006 10:59:52 -0400
Added: trunk/packages/vim/upstream/patches/7.0.084
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.084?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.084 (added)
+++ trunk/packages/vim/upstream/patches/7.0.084 Sat Sep 9 14:17:16 2006
@@ -1,0 +1,221 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.084
+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.084
+Problem: The garbage collector may do its work while some Lists or
+ Dictionaries are used internally, e.g., by ":echo" that runs into
+ the more-prompt or ":echo [garbagecollect()]".
+Solution: Only do garbage collection when waiting for a character at the
+ toplevel. Let garbagecollect() set a flag that is handled at the
+ toplevel before waiting for a character.
+Files: src/eval.c, src/getchar.c, src/globals.h, src/main.c
+
+
+*** ../vim-7.0.083/src/eval.c Sun Sep 3 15:38:02 2006
+--- src/eval.c Tue Sep 5 11:49:38 2006
+***************
+*** 6074,6079 ****
+--- 6074,6083 ----
+ tabpage_T *tp;
+ #endif
+
++ /* Only do this once. */
++ want_garbage_collect = FALSE;
++ may_garbage_collect = FALSE;
++
+ /*
+ * 1. Go through all accessible variables and mark all lists and dicts
+ * with copyID.
+***************
+*** 9636,9642 ****
+ typval_T *argvars;
+ typval_T *rettv;
+ {
+! garbage_collect();
+ }
+
+ /*
+--- 9640,9648 ----
+ typval_T *argvars;
+ typval_T *rettv;
+ {
+! /* This is postponed until we are back at the toplevel, because we may be
+! * using Lists and Dicts internally. E.g.: ":echo [garbagecollect()]". */
+! want_garbage_collect = TRUE;
+ }
+
+ /*
+*** ../vim-7.0.083/src/getchar.c Wed May 3 23:19:24 2006
+--- src/getchar.c Tue Sep 5 12:55:54 2006
+***************
+*** 1451,1457 ****
+ {
+ updatescript(0);
+ #ifdef FEAT_EVAL
+! garbage_collect();
+ #endif
+ }
+
+--- 1451,1458 ----
+ {
+ updatescript(0);
+ #ifdef FEAT_EVAL
+! if (may_garbage_collect)
+! garbage_collect();
+ #endif
+ }
+
+***************
+*** 1502,1507 ****
+--- 1503,1515 ----
+ int i;
+ #endif
+
++ #ifdef FEAT_EVAL
++ /* Do garbage collection when garbagecollect() was called previously and
++ * we are now at the toplevel. */
++ if (may_garbage_collect && want_garbage_collect)
++ garbage_collect();
++ #endif
++
+ /*
+ * If a character was put back with vungetc, it was already processed.
+ * Return it directly.
+***************
+*** 1511,1523 ****
+ c = old_char;
+ old_char = -1;
+ mod_mask = old_mod_mask;
+- return c;
+ }
+!
+! mod_mask = 0x0;
+! last_recorded_len = 0;
+! for (;;) /* this is done twice if there are modifiers */
+ {
+ if (mod_mask) /* no mapping after modifier has been read */
+ {
+ ++no_mapping;
+--- 1519,1531 ----
+ c = old_char;
+ old_char = -1;
+ mod_mask = old_mod_mask;
+ }
+! else
+ {
++ mod_mask = 0x0;
++ last_recorded_len = 0;
++ for (;;) /* this is done twice if there are modifiers */
++ {
+ if (mod_mask) /* no mapping after modifier has been read */
+ {
+ ++no_mapping;
+***************
+*** 1695,1702 ****
+ }
+ #endif
+
+! return c;
+ }
+ }
+
+ /*
+--- 1703,1722 ----
+ }
+ #endif
+
+! break;
+! }
+ }
++
++ #ifdef FEAT_EVAL
++ /*
++ * In the main loop "may_garbage_collect" can be set to do garbage
++ * collection in the first next vgetc(). It's disabled after that to
++ * avoid internally used Lists and Dicts to be freed.
++ */
++ may_garbage_collect = FALSE;
++ #endif
++
++ return c;
+ }
+
+ /*
+*** ../vim-7.0.083/src/globals.h Sat Sep 2 14:52:41 2006
+--- src/globals.h Tue Sep 5 11:46:10 2006
+***************
+*** 300,308 ****
+ #endif
+
+ #ifdef FEAT_EVAL
+! EXTERN scid_T current_SID INIT(= 0); /* ID of script being sourced or
+! was sourced to define the
+! current function. */
+ #endif
+
+ #if defined(FEAT_EVAL) || defined(FEAT_SYN_HL)
+--- 300,315 ----
+ #endif
+
+ #ifdef FEAT_EVAL
+! /* Garbage collection can only take place when we are sure there are no Lists
+! * or Dictionaries being used internally. This is flagged with
+! * "may_garbage_collect" when we are at the toplevel.
+! * "want_garbage_collect" is set by the garbagecollect() function, which means
+! * we do garbage collection before waiting for a char at the toplevel. */
+! EXTERN int may_garbage_collect INIT(= FALSE);
+! EXTERN int want_garbage_collect INIT(= FALSE);
+!
+! /* ID of script being sourced or was sourced to define the current function. */
+! EXTERN scid_T current_SID INIT(= 0);
+ #endif
+
+ #if defined(FEAT_EVAL) || defined(FEAT_SYN_HL)
+*** ../vim-7.0.083/src/main.c Tue Aug 29 17:28:56 2006
+--- src/main.c Tue Sep 5 12:33:47 2006
+***************
+*** 1130,1135 ****
+--- 1130,1145 ----
+ */
+ update_curswant();
+
++ #ifdef FEAT_EVAL
++ /*
++ * May perform garbage collection when waiting for a character, but
++ * only at the very toplevel. Otherwise we may be using a List or
++ * Dict internally somewhere.
++ * "may_garbage_collect" is reset in vgetc() which is invoked through
++ * do_exmode() and normal_cmd().
++ */
++ may_garbage_collect = (!cmdwin && !noexmode);
++ #endif
+ /*
+ * If we're invoked as ex, do a round of ex commands.
+ * Otherwise, get and execute a normal mode command.
+*** ../vim-7.0.083/src/version.c Sun Sep 3 16:39:51 2006
+--- src/version.c Tue Sep 5 12:51:28 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 84,
+ /**/
+
+--
+LAUNCELOT: At last! A call! A cry of distress ...
+ (he draws his sword, and turns to CONCORDE)
+ Concorde! Brave, Concorde ... you shall not have died in vain!
+CONCORDE: I'm not quite dead, sir ...
+ "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.0.085
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.085?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.085 (added)
+++ trunk/packages/vim/upstream/patches/7.0.085 Sat Sep 9 14:17:16 2006
@@ -1,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.085
+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.085
+Problem: When doing "make test" the viminfo file is modified.
+Solution: Use another viminfo file after setting 'compatible.
+Files: src/testdir/test56.in
+
+
+*** ../vim-7.0.084/src/testdir/test56.in Thu May 19 00:21:20 2005
+--- src/testdir/test56.in Sun Sep 3 16:28:41 2006
+***************
+*** 3,9 ****
+ STARTTEST
+ :so small.vim
+ :"
+! :set nocp
+ :/^start:/+1,/^end:/-1w! Xtest.vim
+ :source Xtest.vim
+ _x
+--- 3,9 ----
+ STARTTEST
+ :so small.vim
+ :"
+! :set nocp viminfo+=nviminfo
+ :/^start:/+1,/^end:/-1w! Xtest.vim
+ :source Xtest.vim
+ _x
+*** ../vim-7.0.084/src/version.c Tue Sep 5 12:57:14 2006
+--- src/version.c Tue Sep 5 13:33:22 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 85,
+ /**/
+
+--
+Apologies for taking up the bandwidth with the apology. Anything else I
+can apologise for ...... er no can't think of anything, sorry about that.
+ Andy Hunt (Member of British Olympic Apology Squad)
+
+ /// 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.086
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.086?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.086 (added)
+++ trunk/packages/vim/upstream/patches/7.0.086 Sat Sep 9 14:17:16 2006
@@ -1,0 +1,57 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.086
+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.086
+Problem: getqflist() returns entries for pattern and text with the number
+ zero. Passing these to setqflist() results in the string "0".
+Solution: Use an empty string instead of the number zero.
+Files: src/quickfix.c
+
+
+*** ../vim-7.0.085/src/quickfix.c Tue Aug 29 17:28:56 2006
+--- src/quickfix.c Mon Sep 4 20:18:48 2006
+***************
+*** 3426,3433 ****
+ || dict_add_nr_str(dict, "col", (long)qfp->qf_col, NULL) == FAIL
+ || dict_add_nr_str(dict, "vcol", (long)qfp->qf_viscol, NULL) == FAIL
+ || dict_add_nr_str(dict, "nr", (long)qfp->qf_nr, NULL) == FAIL
+! || dict_add_nr_str(dict, "pattern", 0L, qfp->qf_pattern) == FAIL
+! || dict_add_nr_str(dict, "text", 0L, qfp->qf_text) == FAIL
+ || dict_add_nr_str(dict, "type", 0L, buf) == FAIL
+ || dict_add_nr_str(dict, "valid", (long)qfp->qf_valid, NULL) == FAIL)
+ return FAIL;
+--- 3426,3435 ----
+ || dict_add_nr_str(dict, "col", (long)qfp->qf_col, NULL) == FAIL
+ || dict_add_nr_str(dict, "vcol", (long)qfp->qf_viscol, NULL) == FAIL
+ || dict_add_nr_str(dict, "nr", (long)qfp->qf_nr, NULL) == FAIL
+! || dict_add_nr_str(dict, "pattern", 0L,
+! qfp->qf_pattern == NULL ? (char_u *)"" : qfp->qf_pattern) == FAIL
+! || dict_add_nr_str(dict, "text", 0L,
+! qfp->qf_text == NULL ? (char_u *)"" : qfp->qf_text) == FAIL
+ || dict_add_nr_str(dict, "type", 0L, buf) == FAIL
+ || dict_add_nr_str(dict, "valid", (long)qfp->qf_valid, NULL) == FAIL)
+ return FAIL;
+*** ../vim-7.0.085/src/version.c Tue Sep 5 13:34:30 2006
+--- src/version.c Tue Sep 5 15:35:40 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 86,
+ /**/
+
+--
+A vacation is a period of travel during which you find that you
+took twice as many clothes and half as much money as you needed.
+
+ /// 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.087
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.087?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.087 (added)
+++ trunk/packages/vim/upstream/patches/7.0.087 Sat Sep 9 14:17:16 2006
@@ -1,0 +1,262 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.087
+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.087
+Problem: After ":file fname" and ":saveas fname" the 'autochdir' option
+ does not take effect. (Yakov Lerner)
+ Commands for handling 'autochdir' are repeated many times.
+Solution: Add the DO_AUTOCHDIR macro and do_autochdir(). Use it for
+ ":file fname" and ":saveas fname".
+Files: src/proto/buffer.pro, src/buffer.c, src/ex_cmds.c, src/macros.h,
+ src/option.c, src/window.c
+
+
+*** ../vim-7.0.086/src/proto/buffer.pro Sun Apr 30 20:25:32 2006
+--- src/proto/buffer.pro Tue Sep 5 16:25:40 2006
+***************
+*** 10,15 ****
+--- 10,16 ----
+ extern int do_buffer __ARGS((int action, int start, int dir, int count, int forceit));
+ extern void set_curbuf __ARGS((buf_T *buf, int action));
+ extern void enter_buffer __ARGS((buf_T *buf));
++ extern void do_autochdir __ARGS((void));
+ extern buf_T *buflist_new __ARGS((char_u *ffname, char_u *sfname, linenr_T lnum, int flags));
+ extern void free_buf_options __ARGS((buf_T *buf, int free_p_ff));
+ extern int buflist_getfile __ARGS((int n, linenr_T lnum, int options, int forceit));
+*** ../vim-7.0.086/src/buffer.c Tue Aug 29 16:52:01 2006
+--- src/buffer.c Tue Sep 5 15:18:19 2006
+***************
+*** 434,445 ****
+ if (usingNetbeans)
+ netbeans_file_closed(buf);
+ #endif
+! #ifdef FEAT_AUTOCHDIR
+! /* Change directories when the acd option is set on. */
+! if (p_acd && curbuf->b_ffname != NULL
+! && vim_chdirfile(curbuf->b_ffname) == OK)
+! shorten_fnames(TRUE);
+! #endif
+
+ /*
+ * Remove the buffer from the list.
+--- 434,441 ----
+ if (usingNetbeans)
+ netbeans_file_closed(buf);
+ #endif
+! /* Change directories when the 'acd' option is set. */
+! DO_AUTOCHDIR
+
+ /*
+ * Remove the buffer from the list.
+***************
+*** 1422,1433 ****
+ netbeans_file_activated(curbuf);
+ #endif
+
+! #ifdef FEAT_AUTOCHDIR
+! /* Change directories when the acd option is set on. */
+! if (p_acd && curbuf->b_ffname != NULL
+! && vim_chdirfile(curbuf->b_ffname) == OK)
+! shorten_fnames(TRUE);
+! #endif
+
+ #ifdef FEAT_KEYMAP
+ if (curbuf->b_kmap_state & KEYMAP_INIT)
+--- 1418,1425 ----
+ netbeans_file_activated(curbuf);
+ #endif
+
+! /* Change directories when the 'acd' option is set. */
+! DO_AUTOCHDIR
+
+ #ifdef FEAT_KEYMAP
+ if (curbuf->b_kmap_state & KEYMAP_INIT)
+***************
+*** 1435,1440 ****
+--- 1427,1444 ----
+ #endif
+ redraw_later(NOT_VALID);
+ }
++
++ #if defined(FEAT_AUTOCHDIR) || defined(PROTO)
++ /*
++ * Change to the directory of the current buffer.
++ */
++ void
++ do_autochdir()
++ {
++ if (curbuf->b_ffname != NULL && vim_chdirfile(curbuf->b_ffname) == OK)
++ shorten_fnames(TRUE);
++ }
++ #endif
+
+ /*
+ * functions for dealing with the buffer list
+*** ../vim-7.0.086/src/ex_cmds.c Tue Aug 29 17:28:56 2006
+--- src/ex_cmds.c Tue Sep 5 15:24:58 2006
+***************
+*** 2458,2463 ****
+--- 2458,2465 ----
+ #ifdef FEAT_AUTOCMD
+ apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, FALSE, curbuf);
+ #endif
++ /* Change directories when the 'acd' option is set. */
++ DO_AUTOCHDIR
+ }
+ /* print full file name if :cd used */
+ fileinfo(FALSE, FALSE, eap->forceit);
+***************
+*** 2675,2682 ****
+ eap, eap->append, eap->forceit, TRUE, FALSE);
+
+ /* After ":saveas fname" reset 'readonly'. */
+! if (eap->cmdidx == CMD_saveas && retval == OK)
+! curbuf->b_p_ro = FALSE;
+ }
+
+ theend:
+--- 2677,2689 ----
+ eap, eap->append, eap->forceit, TRUE, FALSE);
+
+ /* After ":saveas fname" reset 'readonly'. */
+! if (eap->cmdidx == CMD_saveas)
+! {
+! if (retval == OK)
+! curbuf->b_p_ro = FALSE;
+! /* Change directories when the 'acd' option is set. */
+! DO_AUTOCHDIR
+! }
+ }
+
+ theend:
+***************
+*** 3547,3557 ****
+ foldUpdateAll(curwin);
+ #endif
+
+! #ifdef FEAT_AUTOCHDIR
+! if (p_acd && curbuf->b_ffname != NULL
+! && vim_chdirfile(curbuf->b_ffname) == OK)
+! shorten_fnames(TRUE);
+! #endif
+ /*
+ * Careful: open_buffer() and apply_autocmds() may change the current
+ * buffer and window.
+--- 3554,3562 ----
+ foldUpdateAll(curwin);
+ #endif
+
+! /* Change directories when the 'acd' option is set. */
+! DO_AUTOCHDIR
+!
+ /*
+ * Careful: open_buffer() and apply_autocmds() may change the current
+ * buffer and window.
+***************
+*** 3718,3729 ****
+ if (p_im)
+ need_start_insertmode = TRUE;
+
+! #ifdef FEAT_AUTOCHDIR
+! /* Change directories when the acd option is set on. */
+! if (p_acd && curbuf->b_ffname != NULL
+! && vim_chdirfile(curbuf->b_ffname) == OK)
+! shorten_fnames(TRUE);
+! #endif
+
+ #if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG)
+ if (gui.in_use && curbuf->b_ffname != NULL)
+--- 3723,3730 ----
+ if (p_im)
+ need_start_insertmode = TRUE;
+
+! /* Change directories when the 'acd' option is set. */
+! DO_AUTOCHDIR
+
+ #if defined(FEAT_SUN_WORKSHOP) || defined(FEAT_NETBEANS_INTG)
+ if (gui.in_use && curbuf->b_ffname != NULL)
+*** ../vim-7.0.086/src/macros.h Wed Mar 1 23:00:25 2006
+--- src/macros.h Tue Sep 5 15:15:30 2006
+***************
+*** 276,278 ****
+--- 276,284 ----
+ # define MB_CHARLEN(p) STRLEN(p)
+ # define PTR2CHAR(p) ((int)*(p))
+ #endif
++
++ #ifdef FEAT_AUTOCHDIR
++ # define DO_AUTOCHDIR if (p_acd) do_autochdir();
++ #else
++ # define DO_AUTOCHDIR
++ #endif
+*** ../vim-7.0.086/src/option.c Tue Aug 29 17:28:56 2006
+--- src/option.c Tue Sep 5 15:20:04 2006
+***************
+*** 7326,7334 ****
+ #ifdef FEAT_AUTOCHDIR
+ else if ((int *)varp == &p_acd)
+ {
+! if (p_acd && curbuf->b_ffname != NULL
+! && vim_chdirfile(curbuf->b_ffname) == OK)
+! shorten_fnames(TRUE);
+ }
+ #endif
+
+--- 7326,7333 ----
+ #ifdef FEAT_AUTOCHDIR
+ else if ((int *)varp == &p_acd)
+ {
+! /* Change directories when the 'acd' option is set now. */
+! DO_AUTOCHDIR
+ }
+ #endif
+
+*** ../vim-7.0.086/src/window.c Tue Aug 29 17:28:56 2006
+--- src/window.c Tue Sep 5 15:20:35 2006
+***************
+*** 3954,3966 ****
+ setmouse(); /* in case jumped to/from help buffer */
+ #endif
+
+! #ifdef FEAT_AUTOCHDIR
+! /* Change directories when the 'acd' option is set on and after
+! * switching windows. */
+! if (p_acd && curbuf->b_ffname != NULL
+! && vim_chdirfile(curbuf->b_ffname) == OK)
+! shorten_fnames(TRUE);
+! #endif
+ }
+
+ #endif /* FEAT_WINDOWS */
+--- 3954,3961 ----
+ setmouse(); /* in case jumped to/from help buffer */
+ #endif
+
+! /* Change directories when the 'acd' option is set. */
+! DO_AUTOCHDIR
+ }
+
+ #endif /* FEAT_WINDOWS */
+*** ../vim-7.0.086/src/version.c Tue Sep 5 15:36:30 2006
+--- src/version.c Tue Sep 5 15:52:45 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 87,
+ /**/
+
+--
+Overflow on /dev/null, please empty the bit bucket.
+
+ /// 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.088
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.088?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.088 (added)
+++ trunk/packages/vim/upstream/patches/7.0.088 Sat Sep 9 14:17:16 2006
@@ -1,0 +1,84 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.088
+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.088
+Problem: When compiled with Perl the generated prototypes have "extern"
+ unnecessarily added.
+Solution: Remove the "-pipe" argument from PERL_CFLAGS.
+Files: src/auto/configure, src/configure.in
+
+
+*** ../vim-7.0.087/src/auto/configure Thu May 4 23:52:03 2006
+--- src/auto/configure Tue Sep 5 17:09:55 2006
+***************
+*** 4014,4020 ****
+ LDFLAGS=$ldflags_save
+ if test $perl_ok = yes; then
+ if test "X$perlcppflags" != "X"; then
+! PERL_CFLAGS="$perlcppflags"
+ fi
+ if test "X$perlldflags" != "X"; then
+ LDFLAGS="$perlldflags $LDFLAGS"
+--- 4014,4020 ----
+ LDFLAGS=$ldflags_save
+ if test $perl_ok = yes; then
+ if test "X$perlcppflags" != "X"; then
+! PERL_CFLAGS=`echo "$perlcppflags" | sed 's/-pipe //'`
+ fi
+ if test "X$perlldflags" != "X"; then
+ LDFLAGS="$perlldflags $LDFLAGS"
+*** ../vim-7.0.087/src/configure.in Thu May 4 23:52:32 2006
+--- src/configure.in Tue Sep 5 17:09:50 2006
+***************
+*** 508,514 ****
+ LDFLAGS=$ldflags_save
+ if test $perl_ok = yes; then
+ if test "X$perlcppflags" != "X"; then
+! PERL_CFLAGS="$perlcppflags"
+ fi
+ if test "X$perlldflags" != "X"; then
+ LDFLAGS="$perlldflags $LDFLAGS"
+--- 508,515 ----
+ LDFLAGS=$ldflags_save
+ if test $perl_ok = yes; then
+ if test "X$perlcppflags" != "X"; then
+! dnl remove -pipe, it confuses cproto
+! PERL_CFLAGS=`echo "$perlcppflags" | sed 's/-pipe //'`
+ fi
+ if test "X$perlldflags" != "X"; then
+ LDFLAGS="$perlldflags $LDFLAGS"
+*** ../vim-7.0.087/src/version.c Tue Sep 5 16:29:38 2006
+--- src/version.c Tue Sep 5 17:27:33 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 88,
+ /**/
+
+--
+ ** Hello and Welcome to the Psychiatric Hotline **
+If you are obsessive-compulsive, please press 1 repeatedly.
+If you are co-dependent, please ask someone to press 2.
+If you have multiple personalities, please press 3, 4, 5 and 6.
+If you are paranoid-delusional, we know who you are and what you want
+ - just stay on the line so we can trace the call.
+If you are schizophrenic, listen carefully and a little voice will
+ tell you which number to press next.
+If you are manic-depressive, it doesn't matter which number you press
+ - no one will answer.
+If you suffer from panic attacks, push every button you can find.
+If you are sane, please hold on - we have the rest of humanity on the
+ other line and they desparately want to ask you a few questions.
+
+ /// 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.089
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.089?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.089 (added)
+++ trunk/packages/vim/upstream/patches/7.0.089 Sat Sep 9 14:17:16 2006
@@ -1,0 +1,97 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.089
+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.089
+Problem: "ga" does not work properly for a non-Unicode multi-byte encoding.
+Solution: Only check for composing chars for utf-8. (Taro Muraoka)
+Files: src/ex_cmds.c
+
+
+*** ../vim-7.0.088/src/ex_cmds.c Tue Sep 5 16:29:38 2006
+--- src/ex_cmds.c Tue Sep 5 18:12:41 2006
+***************
+*** 95,101 ****
+ _("<%s>%s%s %d, Hex %02x, Octal %03o"),
+ transchar(c), buf1, buf2, c, c, c);
+ #ifdef FEAT_MBYTE
+! c = cc[ci++];
+ #endif
+ }
+
+--- 95,104 ----
+ _("<%s>%s%s %d, Hex %02x, Octal %03o"),
+ transchar(c), buf1, buf2, c, c, c);
+ #ifdef FEAT_MBYTE
+! if (enc_utf8)
+! c = cc[ci++];
+! else
+! c = 0;
+ #endif
+ }
+
+***************
+*** 108,114 ****
+ if (len > 0)
+ IObuff[len++] = ' ';
+ IObuff[len++] = '<';
+! if (utf_iscomposing(c)
+ # ifdef USE_GUI
+ && !gui.in_use
+ # endif
+--- 111,117 ----
+ if (len > 0)
+ IObuff[len++] = ' ';
+ IObuff[len++] = '<';
+! if (enc_utf8 && utf_iscomposing(c)
+ # ifdef USE_GUI
+ && !gui.in_use
+ # endif
+***************
+*** 120,126 ****
+ : _("> %d, Hex %08x, Octal %o"), c, c, c);
+ if (ci == MAX_MCO)
+ break;
+! c = cc[ci++];
+ }
+ #endif
+
+--- 123,132 ----
+ : _("> %d, Hex %08x, Octal %o"), c, c, c);
+ if (ci == MAX_MCO)
+ break;
+! if (enc_utf8)
+! c = cc[ci++];
+! else
+! c = 0;
+ }
+ #endif
+
+*** ../vim-7.0.088/src/version.c Tue Sep 5 17:30:25 2006
+--- src/version.c Tue Sep 5 18:19:42 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 89,
+ /**/
+
+--
+ [clop clop]
+GUARD #1: Halt! Who goes there?
+ARTHUR: It is I, Arthur, son of Uther Pendragon, from the castle of
+ Camelot. King of the Britons, defeator of the Saxons, sovereign of
+ all England!
+GUARD #1: Pull the other one!
+ 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.0.090
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.090?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.090 (added)
+++ trunk/packages/vim/upstream/patches/7.0.090 Sat Sep 9 14:17:16 2006
@@ -1,0 +1,81 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.090
+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.090
+Problem: Cancelling the conform() dialog on the console with Esc requires
+ typing it twice. (Benji Fisher)
+Solution: When the start of an escape sequence is found use 'timeoutlen' or
+ 'ttimeoutlen'.
+Files: src/misc1.c
+
+
+*** ../vim-7.0.089/src/misc1.c Sun Sep 3 16:39:51 2006
+--- src/misc1.c Tue Sep 5 20:31:43 2006
+***************
+*** 3016,3021 ****
+--- 3016,3022 ----
+ int len = 0;
+ int n;
+ int save_mapped_ctrl_c = mapped_ctrl_c;
++ int waited = 0;
+
+ mapped_ctrl_c = FALSE; /* mappings are not used here */
+ for (;;)
+***************
+*** 3034,3044 ****
+ /* Replace zero and CSI by a special key code. */
+ n = fix_input_buffer(buf + len, n, FALSE);
+ len += n;
+ }
+
+! /* incomplete termcode: get more characters */
+! if ((n = check_termcode(1, buf, len)) < 0)
+ continue;
+ /* found a termcode: adjust length */
+ if (n > 0)
+ len = n;
+--- 3035,3050 ----
+ /* Replace zero and CSI by a special key code. */
+ n = fix_input_buffer(buf + len, n, FALSE);
+ len += n;
++ waited = 0;
+ }
++ else if (len > 0)
++ ++waited; /* keep track of the waiting time */
+
+! /* Incomplete termcode and not timed out yet: get more characters */
+! if ((n = check_termcode(1, buf, len)) < 0
+! && (!p_ttimeout || waited * 100L < (p_ttm < 0 ? p_tm : p_ttm)))
+ continue;
++
+ /* found a termcode: adjust length */
+ if (n > 0)
+ len = n;
+*** ../vim-7.0.089/src/version.c Tue Sep 5 18:28:45 2006
+--- src/version.c Tue Sep 5 20:49:01 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 90,
+ /**/
+
+--
+GUARD #1: Where'd you get the coconut?
+ARTHUR: We found them.
+GUARD #1: Found them? In Mercea? The coconut's tropical!
+ARTHUR: What do you mean?
+GUARD #1: Well, this is a temperate zone.
+ 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.0.091
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.091?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.091 (added)
+++ trunk/packages/vim/upstream/patches/7.0.091 Sat Sep 9 14:17:16 2006
@@ -1,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.091
+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.091
+Problem: Using winrestview() while 'showcmd' is set causes the cursor to be
+ displayed in the wrong position. (Yakov Lerner)
+Solution: Set the window topline properly.
+Files: src/eval.c
+
+
+*** ../vim-7.0.090/src/eval.c Tue Sep 5 12:57:14 2006
+--- src/eval.c Tue Sep 5 21:21:37 2006
+***************
+*** 16225,16231 ****
+ curwin->w_curswant = get_dict_number(dict, (char_u *)"curswant");
+ curwin->w_set_curswant = FALSE;
+
+! curwin->w_topline = get_dict_number(dict, (char_u *)"topline");
+ #ifdef FEAT_DIFF
+ curwin->w_topfill = get_dict_number(dict, (char_u *)"topfill");
+ #endif
+--- 16225,16231 ----
+ curwin->w_curswant = get_dict_number(dict, (char_u *)"curswant");
+ curwin->w_set_curswant = FALSE;
+
+! set_topline(curwin, get_dict_number(dict, (char_u *)"topline"));
+ #ifdef FEAT_DIFF
+ curwin->w_topfill = get_dict_number(dict, (char_u *)"topfill");
+ #endif
+*** ../vim-7.0.090/src/version.c Tue Sep 5 20:56:11 2006
+--- src/version.c Wed Sep 6 22:12:31 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 91,
+ /**/
+
+--
+Shit makes the flowers grow and that's beautiful
+
+ /// 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.092
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.092?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.092 (added)
+++ trunk/packages/vim/upstream/patches/7.0.092 Sat Sep 9 14:17:16 2006
@@ -1,0 +1,104 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.092
+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.092 (after 7.0.082 and 7.0.084)
+Problem: The list of internal function arguments is obsolete now that
+ garbage collection is only done at the toplevel.
+Solution: Remove the list of all arguments to internal functions.
+Files: src/eval.c
+
+
+*** ../vim-7.0.091/src/eval.c Wed Sep 6 22:14:42 2006
+--- src/eval.c Sat Sep 9 12:00:28 2006
+***************
+*** 248,264 ****
+ };
+
+ /*
+- * Struct used to make a list of all arguments used in internal functions.
+- */
+- typedef struct av_list_item_S av_list_item_T;
+- struct av_list_item_S {
+- av_list_item_T *avl_next;
+- typval_T *avl_argvars;
+- };
+-
+- av_list_item_T *argvars_list = NULL;
+-
+- /*
+ * Info used by a ":for" loop.
+ */
+ typedef struct
+--- 248,253 ----
+***************
+*** 6069,6075 ****
+ int i;
+ funccall_T *fc;
+ int did_free = FALSE;
+- av_list_item_T *av;
+ #ifdef FEAT_WINDOWS
+ tabpage_T *tp;
+ #endif
+--- 6058,6063 ----
+***************
+*** 6110,6120 ****
+ set_ref_in_ht(&fc->l_avars.dv_hashtab, copyID);
+ }
+
+- /* arguments for internal functions */
+- for (av = argvars_list; av != NULL; av = av->avl_next)
+- for (i = 0; av->avl_argvars[i].v_type != VAR_UNKNOWN; ++i)
+- set_ref_in_item(&av->avl_argvars[i], copyID);
+-
+ /*
+ * 2. Go through the list of dicts and free items without the copyID.
+ */
+--- 6098,6103 ----
+***************
+*** 7558,7578 ****
+ error = ERROR_TOOMANY;
+ else
+ {
+- av_list_item_T av_list_item;
+-
+- /* Add the arguments to the "argvars_list" to avoid the
+- * garbage collector not seeing them. This isn't needed
+- * for user functions, because the arguments are available
+- * in the a: hashtab. */
+- av_list_item.avl_argvars = argvars;
+- av_list_item.avl_next = argvars_list;
+- argvars_list = &av_list_item;
+-
+ argvars[argcount].v_type = VAR_UNKNOWN;
+ functions[i].f_func(argvars, rettv);
+ error = ERROR_NONE;
+-
+- argvars_list = av_list_item.avl_next;
+ }
+ }
+ }
+--- 7541,7549 ----
+*** ../vim-7.0.091/src/version.c Wed Sep 6 22:14:42 2006
+--- src/version.c Sat Sep 9 12:04:55 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 92,
+ /**/
+
+--
+"Hegel was right when he said that we learn from history that man can
+never learn anything from history." (George Bernard Shaw)
+
+ /// 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.093
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.093?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.093 (added)
+++ trunk/packages/vim/upstream/patches/7.0.093 Sat Sep 9 14:17:16 2006
@@ -1,0 +1,74 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.093
+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.093
+Problem: The matchparen plugin can't handle a 'matchpairs' value where a
+ colon is matched.
+Solution: Change the split() that is used to change 'matchpairs' into a
+ List.
+Files: runtime/plugin/matchparen.vim
+
+
+*** ../vim-7.0.092/runtime/plugin/matchparen.vim Wed Sep 6 22:13:48 2006
+--- runtime/plugin/matchparen.vim Sat Sep 9 13:35:54 2006
+***************
+*** 1,6 ****
+ " Vim plugin for showing matching parens
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2006 Jun 26
+
+ " Exit quickly when:
+ " - this plugin was already loaded (or disabled)
+--- 1,6 ----
+ " Vim plugin for showing matching parens
+ " Maintainer: Bram Moolenaar <Bram at vim.org>
+! " Last Change: 2006 Sep 09
+
+ " Exit quickly when:
+ " - this plugin was already loaded (or disabled)
+***************
+*** 44,50 ****
+ let before = 0
+
+ let c = getline(c_lnum)[c_col - 1]
+! let plist = split(&matchpairs, ':\|,')
+ let i = index(plist, c)
+ if i < 0
+ " not found, in Insert mode try character before the cursor
+--- 44,50 ----
+ let before = 0
+
+ let c = getline(c_lnum)[c_col - 1]
+! let plist = split(&matchpairs, '.\zs[:,]')
+ let i = index(plist, c)
+ if i < 0
+ " not found, in Insert mode try character before the cursor
+*** ../vim-7.0.092/src/version.c Sat Sep 9 12:05:39 2006
+--- src/version.c Sat Sep 9 13:29:58 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 93,
+ /**/
+
+--
+BLACK KNIGHT: I move for no man.
+ARTHUR: So be it!
+ [hah] [parry thrust]
+ [ARTHUR chops the BLACK KNIGHT's left arm off]
+ARTHUR: Now stand aside, worthy adversary.
+BLACK KNIGHT: 'Tis but a scratch.
+ 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.0.094
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.094?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.094 (added)
+++ trunk/packages/vim/upstream/patches/7.0.094 Sat Sep 9 14:17:16 2006
@@ -1,0 +1,73 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.094
+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.094
+Problem: When a hidden buffer is made the current buffer and another file
+ edited later, the file message will still be given. Using
+ ":silent" also doesn't prevent the file message. (Marvin Renich)
+Solution: Reset the need_fileinfo flag when reading a file. Don't set
+ need_fileinfo when msg_silent is set.
+Files: src/buffer.c, src/fileio.c
+
+
+*** ../vim-7.0.093/src/buffer.c Tue Sep 5 16:29:38 2006
+--- src/buffer.c Thu Sep 7 21:43:41 2006
+***************
+*** 1386,1392 ****
+ }
+ else
+ {
+! need_fileinfo = TRUE; /* display file info after redraw */
+ (void)buf_check_timestamp(curbuf, FALSE); /* check if file changed */
+ #ifdef FEAT_AUTOCMD
+ curwin->w_topline = 1;
+--- 1386,1393 ----
+ }
+ else
+ {
+! if (!msg_silent)
+! need_fileinfo = TRUE; /* display file info after redraw */
+ (void)buf_check_timestamp(curbuf, FALSE); /* check if file changed */
+ #ifdef FEAT_AUTOCMD
+ curwin->w_topline = 1;
+*** ../vim-7.0.093/src/fileio.c Tue Aug 29 18:16:37 2006
+--- src/fileio.c Wed Sep 6 22:54:19 2006
+***************
+*** 316,321 ****
+--- 316,324 ----
+ * display the line. */
+ ex_no_reprint = TRUE;
+
++ /* don't display the file info for another buffer now */
++ need_fileinfo = FALSE;
++
+ /*
+ * For Unix: Use the short file name whenever possible.
+ * Avoids problems with networks and when directory names are changed.
+*** ../vim-7.0.093/src/version.c Sat Sep 9 13:36:51 2006
+--- src/version.c Sat Sep 9 14:19:04 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 94,
+ /**/
+
+--
+ARTHUR: A scratch? Your arm's off!
+BLACK KNIGHT: No, it isn't.
+ARTHUR: Well, what's that then?
+BLACK KNIGHT: I've had worse.
+ 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/get_patches.py
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/get_patches.py?rev=762&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/get_patches.py (added)
+++ trunk/packages/vim/upstream/patches/get_patches.py Sat Sep 9 14:17:16 2006
@@ -1,0 +1,46 @@
+#!/usr/bin/python
+#
+# Copyright (C) 2006, Stefano Zacchiroli <zack at debian.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# $Id$
+
+host='ftp.vim.org'
+dir='pub/vim/patches/7.0'
+
+import os
+import re
+import string
+
+from ftplib import FTP
+
+patch_RE = re.compile(r'^\d+\.\d+\.\d+$')
+
+print 'connecting to %s' % host
+
+ftp=FTP(host)
+ftp.login()
+
+patches = []
+
+files = ftp.nlst(dir)
+for f in files:
+ base = os.path.basename(f)
+ if patch_RE.match(base) and not os.path.isfile(base):
+ print 'patch %s is missing here: retrieving it from %s ...' % (base, host)
+ ftp.retrbinary('RETR %s' % f, open(base, 'w').write)
+ patches.append(base)
+
+if patches:
+ print 'updating debian/README to latest upstream ...'
+ ftp.retrbinary('RETR %s/README' % dir,
+ open('../../debian/README', 'w').write)
+ print 'adding downloaded patches to the SVN repository ...'
+ os.system('svn add %s' % string.join(patches))
+
+print 'All done.'
+
Propchange: trunk/packages/vim/upstream/patches/get_patches.py
------------------------------------------------------------------------------
svn:executable = *
Propchange: trunk/packages/vim/upstream/patches/get_patches.py
------------------------------------------------------------------------------
svn:keywords = Id
More information about the pkg-vim-maintainers
mailing list