r931 - in /trunk/packages/vim: debian/README debian/changelog
patches/debchangelog-ftplugin.vim.diff patches/debchangelog.vim.diff
upstream/patches/7.0.237 upstream/patches/7.0.238 upstream/patches/7.0.239
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Wed May 2 14:35:55 UTC 2007
Author: jamessan
Date: Wed May 2 14:35:52 2007
New Revision: 931
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=931
Log:
Upstream patches 237 - 239.
Move debchangelog.vim.diff -> debchangelog-ftplugin.vim.diff in prep for a debchangelog-syntax.vim.diff
Merge the ftplugin/debchangelog.vim patch which lets the user disable the automatic folding
Added:
trunk/packages/vim/patches/debchangelog-ftplugin.vim.diff
- copied unchanged from r924, trunk/packages/vim/patches/debchangelog.vim.diff
trunk/packages/vim/upstream/patches/7.0.237
trunk/packages/vim/upstream/patches/7.0.238
trunk/packages/vim/upstream/patches/7.0.239
Removed:
trunk/packages/vim/patches/debchangelog.vim.diff
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=931&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed May 2 14:35:52 2007
@@ -267,3 +267,6 @@
1723 7.0.234 feedkeys() may be invoked from a modeline
2299 7.0.235 writefile() may be invoked from a modeline
6971 7.0.236 'maxmemtot' wrong, newer Linux sysinfo() uses mem_unit field
+ 3847 7.0.237 'modeline' should default to off for root
+ 1777 7.0.238 crash when using ":match" pattern that runs into maxmempattern
+ 3886 7.0.239 session file has a problem with local directories
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=931&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed May 2 14:35:52 2007
@@ -1,17 +1,17 @@
-vim (1:7.0-236+1) UNRELEASED; urgency=low
+vim (1:7.0-239+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (220 - 236), see README.gz for details.
+ * New upstream patches (220 - 239), see README.gz for details.
[ James Vega ]
- * patches/debchangelog.vim.diff:
+ * patches/debchangelog-ftplugin.vim.diff:
+ Call foldopen silently so Vim doesn't error if there are no folds.
(Closes: #416184)
+ Allow users to let g:debchangelog_fold_disabled to disable automatic
folding of debchangelogs. 'foldexpr' and 'foldtext' will still be set
but 'foldmethod' will not be changed to 'expr'.
- -- Stefano Zacchiroli <zack at debian.org> Tue, 01 May 2007 14:53:02 +0200
+ -- James Vega <jamessan at debian.org> Wed, 02 May 2007 10:32:51 -0400
vim (1:7.0-219+1) unstable; urgency=low
Added: trunk/packages/vim/upstream/patches/7.0.237
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.237?rev=931&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.237 (added)
+++ trunk/packages/vim/upstream/patches/7.0.237 Wed May 2 14:35:52 2007
@@ -1,0 +1,103 @@
+To: vim-dev at vim.org
+Subject: patch 7.0.237
+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.237
+Problem: For root it is recommended to not use 'modeline', but in
+ not-compatible mode the default is on.
+Solution: Let 'modeline' default to off for root.
+Files: runtime/doc/options.txt, src/option.c
+
+
+*** ../vim-7.0.236/runtime/doc/options.txt Tue Oct 10 18:43:50 2006
+--- runtime/doc/options.txt Tue May 1 13:29:08 2007
+***************
+*** 1,4 ****
+! *options.txt* For Vim version 7.0. Last change: 2006 May 04
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+--- 1,4 ----
+! *options.txt* For Vim version 7.0. Last change: 2007 May 01
+
+
+ VIM REFERENCE MANUAL by Bram Moolenaar
+***************
+*** 528,534 ****
+ ':' is removed. Thus to include "\:" you have to specify "\\:".
+
+ No other commands than "set" are supported, for security reasons (somebody
+! might create a Trojan horse text file with modelines).
+
+ Hint: If you would like to do something else than setting an option, you could
+ define an autocommand that checks the file for a specific string. For
+--- 528,539 ----
+ ':' is removed. Thus to include "\:" you have to specify "\\:".
+
+ No other commands than "set" are supported, for security reasons (somebody
+! might create a Trojan horse text file with modelines). And not all options
+! can be set. For some options a flag is set, so that when it's used the
+! |sandbox| is effective. Still, there is always a small risc that a modeline
+! causes trouble. E.g., when some joker sets 'textwidth' to 5 all your lines
+! are wrapped unexpectedly. So disable modelines before editing untrusted text.
+! The mail ftplugin does this, for example.
+
+ Hint: If you would like to do something else than setting an option, you could
+ define an autocommand that checks the file for a specific string. For
+***************
+*** 4520,4526 ****
+ languages, no matter what you set 'mkspellmem' to.
+
+ *'modeline'* *'ml'* *'nomodeline'* *'noml'*
+! 'modeline' 'ml' boolean (Vim default: on, Vi default: off)
+ local to buffer
+ *'modelines'* *'mls'*
+ 'modelines' 'mls' number (default 5)
+--- 4557,4564 ----
+ languages, no matter what you set 'mkspellmem' to.
+
+ *'modeline'* *'ml'* *'nomodeline'* *'noml'*
+! 'modeline' 'ml' boolean (Vim default: on (off for root),
+! Vi default: off)
+ local to buffer
+ *'modelines'* *'mls'*
+ 'modelines' 'mls' number (default 5)
+*** ../vim-7.0.236/src/option.c Tue May 1 13:39:14 2007
+--- src/option.c Tue May 1 13:26:10 2007
+***************
+*** 3429,3434 ****
+--- 3429,3439 ----
+ /* the cast to long is required for Manx C, long_i is needed for
+ * MSVC */
+ *(int *)varp = (int)(long)(long_i)options[opt_idx].def_val[dvi];
++ #ifdef UNIX
++ /* 'modeline' defaults to off for root */
++ if (options[opt_idx].indir == PV_ML && getuid() == ROOT_UID)
++ *(int *)varp = FALSE;
++ #endif
+ /* May also set global value for local option. */
+ if (both)
+ *(int *)get_varp_scope(&(options[opt_idx]), OPT_GLOBAL) =
+*** ../vim-7.0.236/src/version.c Tue May 1 13:39:14 2007
+--- src/version.c Tue May 1 19:03:09 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 237,
+ /**/
+
+--
+The users that I support would double-click on a landmine to find out
+what happens. -- A system administrator
+
+ /// 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.238
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.238?rev=931&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.238 (added)
+++ trunk/packages/vim/upstream/patches/7.0.238 Wed May 2 14:35:52 2007
@@ -1,0 +1,62 @@
+To: vim-dev at vim.org
+Subject: patch 7.0.238
+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.238
+Problem: Crash when ":match" pattern runs into 'maxmempattern'. (Yakov
+ Lerner)
+Solution: Don't free the regexp program of match_hl.
+Files: src/screen.c
+
+
+*** ../vim-7.0.237/src/screen.c Tue Nov 28 16:16:03 2006
+--- src/screen.c Tue May 1 21:36:50 2007
+***************
+*** 6477,6485 ****
+ if (called_emsg)
+ {
+ /* Error while handling regexp: stop using this regexp. */
+! vim_free(shl->rm.regprog);
+ shl->rm.regprog = NULL;
+! no_hlsearch = TRUE;
+ break;
+ }
+ if (nmatched == 0)
+--- 6477,6491 ----
+ if (called_emsg)
+ {
+ /* Error while handling regexp: stop using this regexp. */
+! if (shl == &search_hl)
+! {
+! /* don't free the regprog in match_hl[], it's a copy */
+! vim_free(shl->rm.regprog);
+! no_hlsearch = TRUE;
+! }
+ shl->rm.regprog = NULL;
+! shl->lnum = 0;
+! got_int = FALSE; /* avoid the "Type :quit to exit Vim" message */
+ break;
+ }
+ if (nmatched == 0)
+*** ../vim-7.0.237/src/version.c Tue May 1 19:06:39 2007
+--- src/version.c Tue May 1 21:39:48 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 238,
+ /**/
+
+--
+Change is inevitable, except from a vending machine.
+
+ /// 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.239
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.239?rev=931&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.239 (added)
+++ trunk/packages/vim/upstream/patches/7.0.239 Wed May 2 14:35:52 2007
@@ -1,0 +1,119 @@
+To: vim-dev at vim.org
+Subject: patch 7.0.239
+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.239
+Problem: When using local directories and tab pages ":mksession" uses a
+ short file name when it shouldn't. Window-local options from a
+ modeline may be applied to the wrong window. (Teemu Likonen)
+Solution: Add the did_lcd flag, use the full path when it's set. Don't use
+ window-local options from the modeline when using the current
+ window for another buffer in ":doautoall".
+Files: src/fileio.c, src/ex_docmd.c
+
+
+*** ../vim-7.0.238/src/fileio.c Tue Feb 27 16:51:07 2007
+--- src/fileio.c Tue May 1 22:35:34 2007
+***************
+*** 8086,8092 ****
+
+ /* execute the autocommands for this buffer */
+ retval = do_doautocmd(eap->arg, FALSE);
+! do_modelines(0);
+
+ /* restore the current window */
+ aucmd_restbuf(&aco);
+--- 8087,8096 ----
+
+ /* execute the autocommands for this buffer */
+ retval = do_doautocmd(eap->arg, FALSE);
+!
+! /* Execute the modeline settings, but don't set window-local
+! * options if we are using the current window for another buffer. */
+! do_modelines(aco.save_curwin == NULL ? OPT_NOWIN : 0);
+
+ /* restore the current window */
+ aucmd_restbuf(&aco);
+*** ../vim-7.0.238/src/ex_docmd.c Tue Mar 27 16:57:54 2007
+--- src/ex_docmd.c Tue Mar 27 16:49:06 2007
+***************
+*** 375,380 ****
+--- 375,381 ----
+ static int put_view __ARGS((FILE *fd, win_T *wp, int add_edit, unsigned *flagp));
+ static void ex_loadview __ARGS((exarg_T *eap));
+ static char_u *get_view_file __ARGS((int c));
++ static int did_lcd; /* whether ":lcd" was produced for a session */
+ #else
+ # define ex_loadview ex_ni
+ #endif
+***************
+*** 8573,8578 ****
+--- 8574,8581 ----
+ }
+
+ #ifdef FEAT_SESSION
++ did_lcd = FALSE;
++
+ /* ":mkview" or ":mkview 9": generate file name with 'viewdir' */
+ if (eap->cmdidx == CMD_mkview
+ && (*eap->arg == NUL
+***************
+*** 10327,10332 ****
+--- 10330,10336 ----
+ || ses_put_fname(fd, wp->w_localdir, flagp) == FAIL
+ || put_eol(fd) == FAIL)
+ return FAIL;
++ did_lcd = TRUE;
+ }
+
+ return OK;
+***************
+*** 10384,10394 ****
+ char_u *name;
+
+ /* Use the short file name if the current directory is known at the time
+! * the session file will be sourced. Don't do this for ":mkview", we
+! * don't know the current directory. */
+ if (buf->b_sfname != NULL
+ && flagp == &ssop_flags
+! && (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR)))
+ name = buf->b_sfname;
+ else
+ name = buf->b_ffname;
+--- 10388,10401 ----
+ char_u *name;
+
+ /* Use the short file name if the current directory is known at the time
+! * the session file will be sourced.
+! * Don't do this for ":mkview", we don't know the current directory.
+! * Don't do this after ":lcd", we don't keep track of what the current
+! * directory is. */
+ if (buf->b_sfname != NULL
+ && flagp == &ssop_flags
+! && (ssop_flags & (SSOP_CURDIR | SSOP_SESDIR))
+! && !did_lcd)
+ name = buf->b_sfname;
+ else
+ name = buf->b_ffname;
+*** ../vim-7.0.238/src/version.c Tue May 1 22:06:41 2007
+--- src/version.c Tue May 1 23:21:32 2007
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 239,
+ /**/
+
+--
+Those who live by the sword get shot by those who don't.
+
+ /// 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