r815 - in /trunk/packages/vim: debian/ upstream/patches/
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Tue Nov 28 21:20:14 UTC 2006
Author: jamessan
Date: Tue Nov 28 22:20:12 2006
New Revision: 815
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=815
Log:
Upstream patches 165 - 174
Added:
trunk/packages/vim/upstream/patches/7.0.165
trunk/packages/vim/upstream/patches/7.0.166
trunk/packages/vim/upstream/patches/7.0.167
trunk/packages/vim/upstream/patches/7.0.168
trunk/packages/vim/upstream/patches/7.0.169
trunk/packages/vim/upstream/patches/7.0.170
trunk/packages/vim/upstream/patches/7.0.171
trunk/packages/vim/upstream/patches/7.0.172
trunk/packages/vim/upstream/patches/7.0.173
trunk/packages/vim/upstream/patches/7.0.174
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=815&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Tue Nov 28 22:20:12 2006
@@ -194,3 +194,13 @@
5819 7.0.162 doesn't exit with "vim -o a b" and abort at ATTENTION prompt
4306 7.0.163 can't get the position of a sign over the netbeans interface
1518 7.0.164 ":redir @+" doesn't work
+ 2284 7.0.165 using CTRL-L to add to a search pattern fails for some chars
+ 1865 7.0.166 crash with cscope when a file descriptor is NULL
+ 1942 7.0.167 can't redefine a function in a dictionary
+ 2224 7.0.168 reading uninitialized memory and a memory leak in recovery
+ 1812 7.0.169 Visual block highlighting not removed for "I" and "A"
+ 2545 7.0.170 (extra) Win32: un-maximizing and tab pages line problem
+ 14457 7.0.171 (extra) VMS: problem with file names with multiple paths
+ 2389 7.0.172 crash when recovering a file and quitting hit-enter prompt
+ 1703 7.0.173 ":call f().TT()" doesn't work
+ 2838 7.0.174 ":mksession" doesn't restore tab page window layout properly
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=815&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Tue Nov 28 22:20:12 2006
@@ -1,3 +1,10 @@
+vim (1:7.0-174+1) unstable; urgency=low
+
+ [ Debian Vim Maintainers ]
+ * New upstream patches (165 - 174), see README.gz for details.
+
+ -- James Vega <jamessan at debian.org> Tue, 28 Nov 2006 16:19:04 -0500
+
vim (1:7.0-164+1) unstable; urgency=low
[ Debian Vim Maintainers ]
Added: trunk/packages/vim/upstream/patches/7.0.165
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.165?rev=815&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.165 (added)
+++ trunk/packages/vim/upstream/patches/7.0.165 Tue Nov 28 22:20:12 2006
@@ -1,0 +1,76 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.165
+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.165
+Problem: Using CTRL-L at the search prompt adds a "/" and other characters
+ without escaping, causing the pattern not to match.
+Solution: Escape special characters with a backslash.
+Files: src/ex_getln.c
+
+
+*** ../vim-7.0.164/src/ex_getln.c Tue Oct 17 16:26:52 2006
+--- src/ex_getln.c Tue Nov 14 21:36:13 2006
+***************
+*** 34,40 ****
+ int xp_context; /* type of expansion */
+ # ifdef FEAT_EVAL
+ char_u *xp_arg; /* user-defined expansion arg */
+! int input_fn; /* Invoked for input() function */
+ # endif
+ };
+
+--- 34,40 ----
+ int xp_context; /* type of expansion */
+ # ifdef FEAT_EVAL
+ char_u *xp_arg; /* user-defined expansion arg */
+! int input_fn; /* when TRUE Invoked for input() function */
+ # endif
+ };
+
+***************
+*** 1390,1396 ****
+--- 1390,1406 ----
+ {
+ c = gchar_cursor();
+ if (c != NUL)
++ {
++ if (c == firstc || vim_strchr((char_u *)(
++ p_magic ? "\\^$.*[" : "\\^$"), c)
++ != NULL)
++ {
++ /* put a backslash before special characters */
++ stuffcharReadbuff(c);
++ c = '\\';
++ }
+ break;
++ }
+ }
+ goto cmdline_not_changed;
+ }
+*** ../vim-7.0.164/src/version.c Tue Nov 14 20:24:32 2006
+--- src/version.c Tue Nov 21 11:28:43 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 165,
+ /**/
+
+--
+ He was not in the least bit scared to be mashed into a pulp
+ Or to have his eyes gouged out and his elbows broken;
+ To have his kneecaps split and his body burned away
+ And his limbs all hacked and mangled, brave Sir Robin.
+ "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.166
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.166?rev=815&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.166 (added)
+++ trunk/packages/vim/upstream/patches/7.0.166 Tue Nov 28 22:20:12 2006
@@ -1,0 +1,61 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.166
+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.166
+Problem: Crash in cscope code when connection could not be opened.
+ (Kaya Bekiroglu)
+Solution: Check for the file descriptor to be NULL.
+Files: src/if_cscope.c
+
+
+*** ../vim-7.0.165/src/if_cscope.c Mon Oct 30 22:31:30 2006
+--- src/if_cscope.c Tue Nov 14 22:04:30 2006
+***************
+*** 1008,1014 ****
+ totmatches = 0;
+ for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+ {
+! if (csinfo[i].fname == NULL)
+ continue;
+
+ /* send cmd to cscope */
+--- 1008,1014 ----
+ totmatches = 0;
+ for (i = 0; i < CSCOPE_MAX_CONNECTIONS; i++)
+ {
+! if (csinfo[i].fname == NULL || csinfo[i].to_fp == NULL)
+ continue;
+
+ /* send cmd to cscope */
+*** ../vim-7.0.165/src/version.c Tue Nov 21 11:29:56 2006
+--- src/version.c Tue Nov 21 11:42:13 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 166,
+ /**/
+
+--
+The greatest lies of all time:
+ (1) The check is in the mail.
+ (2) We have a really challenging assignment for you.
+ (3) I love you.
+ (4) All bugs have been fixed.
+ (5) This won't hurt a bit.
+ (6) Honey, I just need to debug this program and be home in 5 minutes.
+ (7) I have just sent you an e-mail about that.
+ (8) Of course I'll respect you in the morning.
+ (9) I'm from the government, and I'm here to help you.
+
+ /// 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.167
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.167?rev=815&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.167 (added)
+++ trunk/packages/vim/upstream/patches/7.0.167 Tue Nov 28 22:20:12 2006
@@ -1,0 +1,68 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.167
+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.167
+Problem: ":function" redefining a dict function doesn't work properly.
+ (Richard Emberson)
+Solution: Allow a function name to be a number when it's a function
+ reference.
+Files: src/eval.c
+
+
+*** ../vim-7.0.166/src/eval.c Wed Nov 1 18:33:43 2006
+--- src/eval.c Tue Nov 21 11:04:13 2006
+***************
+*** 18539,18550 ****
+
+ if (!eap->skip)
+ {
+! /* Check the name of the function. */
+ if (name != NULL)
+ arg = name;
+ else
+ arg = fudi.fd_newkey;
+! if (arg != NULL)
+ {
+ if (*arg == K_SPECIAL)
+ j = 3;
+--- 18539,18552 ----
+
+ if (!eap->skip)
+ {
+! /* Check the name of the function. Unless it's a dictionary function
+! * (that we are overwriting). */
+ if (name != NULL)
+ arg = name;
+ else
+ arg = fudi.fd_newkey;
+! if (arg != NULL && (fudi.fd_di == NULL
+! || fudi.fd_di->di_tv.v_type != VAR_FUNC))
+ {
+ if (*arg == K_SPECIAL)
+ j = 3;
+*** ../vim-7.0.166/src/version.c Tue Nov 21 11:43:49 2006
+--- src/version.c Tue Nov 21 11:48:12 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 167,
+ /**/
+
+--
+ They now pass three KNIGHTS impaled to a tree. With their feet off the
+ ground, with one lance through the lot of them, they are skewered up
+ like a barbecue.
+ "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.168
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.168?rev=815&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.168 (added)
+++ trunk/packages/vim/upstream/patches/7.0.168 Tue Nov 28 22:20:12 2006
@@ -1,0 +1,68 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.168
+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.168
+Problem: Using uninitialized memory and memory leak. (Dominique Pelle)
+Solution: Use alloc_clear() instead of alloc() for w_lines. Free
+ b_ml.ml_stack after recovery.
+Files: src/memline.c, src/window.c
+
+
+*** ../vim-7.0.167/src/memline.c Wed Nov 1 18:10:36 2006
+--- src/memline.c Thu Nov 16 22:29:19 2006
+***************
+*** 1329,1334 ****
+--- 1329,1335 ----
+ mf_put(mfp, hp, FALSE, FALSE);
+ mf_close(mfp, FALSE); /* will also vim_free(mfp->mf_fname) */
+ }
++ vim_free(buf->b_ml.ml_stack);
+ vim_free(buf);
+ if (serious_error && called_from_main)
+ ml_close(curbuf, TRUE);
+*** ../vim-7.0.167/src/window.c Tue Oct 24 21:15:09 2006
+--- src/window.c Thu Nov 16 22:24:51 2006
+***************
+*** 4273,4279 ****
+ win_T *wp;
+ {
+ wp->w_lines_valid = 0;
+! wp->w_lines = (wline_T *)alloc((unsigned)(Rows * sizeof(wline_T)));
+ if (wp->w_lines == NULL)
+ return FAIL;
+ return OK;
+--- 4273,4279 ----
+ win_T *wp;
+ {
+ wp->w_lines_valid = 0;
+! wp->w_lines = (wline_T *)alloc_clear((unsigned)(Rows * sizeof(wline_T)));
+ if (wp->w_lines == NULL)
+ return FAIL;
+ return OK;
+*** ../vim-7.0.167/src/version.c Tue Nov 21 19:36:00 2006
+--- src/version.c Tue Nov 21 20:34:13 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 168,
+ /**/
+
+--
+ GALAHAD turns back. We see from his POV the lovely ZOOT standing by him
+ smiling enchantingly and a number of equally delectable GIRLIES draped
+ around in the seductively poulticed room. They look at him smilingly and
+ wave.
+ "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.169
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.169?rev=815&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.169 (added)
+++ trunk/packages/vim/upstream/patches/7.0.169 Tue Nov 28 22:20:12 2006
@@ -1,0 +1,53 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.169
+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.169
+Problem: With a Visual block selection, with the cursor in the left upper
+ corner, pressing "I" doesn't remove the highlighting. (Guopeng
+ Wen)
+Solution: When checking if redrawing is needed also check if Visual
+ selection is still active.
+Files: src/screen.c
+
+
+*** ../vim-7.0.168/src/screen.c Mon Oct 9 22:11:52 2006
+--- src/screen.c Tue Nov 28 16:11:24 2006
+***************
+*** 455,460 ****
+--- 455,461 ----
+ && curwin->w_topline == curwin->w_lines[0].wl_lnum)
+ #ifdef FEAT_VISUAL
+ || (type == INVERTED
++ && VIsual_active
+ && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum
+ && curwin->w_old_visual_mode == VIsual_mode
+ && (curwin->w_valid & VALID_VIRTCOL)
+*** ../vim-7.0.168/src/version.c Tue Nov 21 20:57:21 2006
+--- src/version.c Tue Nov 28 16:13:40 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 169,
+ /**/
+
+--
+ [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.170
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.170?rev=815&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.170 (added)
+++ trunk/packages/vim/upstream/patches/7.0.170 Tue Nov 28 22:20:12 2006
@@ -1,0 +1,98 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.170 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.170 (extra)
+Problem: Win32: Using "gvim --remote-tab foo" when gvim is minimized while
+ it previously was maximized, un-maximizing doesn't work properly.
+ And the labels are not displayed properly when 'encoding' is
+ utf-8.
+Solution: When minimized check for SW_SHOWMINIMIZED. When updating the tab
+ pages line use TCM_SETITEMW instead of TCM_INSERTITEMW. (Liu
+ Yubao)
+Files: src/gui_w48.c
+
+
+*** ../vim-7.0.169/src/gui_w48.c Tue Nov 7 19:05:36 2006
+--- src/gui_w48.c Mon Nov 27 22:26:15 2006
+***************
+*** 2405,2412 ****
+ tiw.mask = TCIF_TEXT;
+ tiw.iImage = -1;
+ tiw.pszText = wstr;
+! SendMessage(s_tabhwnd, TCM_INSERTITEMW, (WPARAM)nr,
+! (LPARAM)&tiw);
+ vim_free(wstr);
+ }
+ }
+--- 2405,2411 ----
+ tiw.mask = TCIF_TEXT;
+ tiw.iImage = -1;
+ tiw.pszText = wstr;
+! SendMessage(s_tabhwnd, TCM_SETITEMW, (WPARAM)nr, (LPARAM)&tiw);
+ vim_free(wstr);
+ }
+ }
+***************
+*** 3033,3045 ****
+ return OK;
+ }
+
+ /*
+ * Return TRUE if the GUI window is maximized, filling the whole screen.
+ */
+ int
+ gui_mch_maximized()
+ {
+! return IsZoomed(s_hwnd);
+ }
+
+ /*
+--- 3032,3056 ----
+ return OK;
+ }
+
++ #ifndef WPF_RESTORETOMAXIMIZED
++ # define WPF_RESTORETOMAXIMIZED 2 /* just in case someone doesn't have it */
++ #endif
++
+ /*
+ * Return TRUE if the GUI window is maximized, filling the whole screen.
+ */
+ int
+ gui_mch_maximized()
+ {
+! WINDOWPLACEMENT wp;
+!
+! wp.length = sizeof(WINDOWPLACEMENT);
+! if (GetWindowPlacement(s_hwnd, &wp))
+! return wp.showCmd == SW_SHOWMAXIMIZED
+! || (wp.showCmd == SW_SHOWMINIMIZED
+! && wp.flags == WPF_RESTORETOMAXIMIZED);
+!
+! return 0;
+ }
+
+ /*
+*** ../vim-7.0.169/src/version.c Tue Nov 28 16:16:03 2006
+--- src/version.c Tue Nov 28 17:16:07 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 170,
+ /**/
+
+--
+Veni, Vidi, Video -- I came, I saw, I taped what I saw.
+
+ /// 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.171
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.171?rev=815&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.171 (added)
+++ trunk/packages/vim/upstream/patches/7.0.171 Tue Nov 28 22:20:12 2006
@@ -1,0 +1,509 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.171 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.171 (extra)
+Problem: VMS: A file name with multiple paths is written in the wrong file.
+Solution: Get the actually used file name. (Zoltan Arpadffy)
+ Also add info to the :version command about compilation.
+Files: src/Make_vms.mms, src/buffer.c, src/os_unix.c, src/version.c
+
+
+*** ../vim-7.0.170/src/Make_vms.mms Sun Apr 30 20:46:53 2006
+--- src/Make_vms.mms Mon Sep 4 20:54:51 2006
+***************
+*** 2,8 ****
+ # Makefile for Vim on OpenVMS
+ #
+ # Maintainer: Zoltan Arpadffy <arpadffy at polarhome.com>
+! # Last change: 2006 Apr 30
+ #
+ # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
+ # with MMS and MMK
+--- 2,8 ----
+ # Makefile for Vim on OpenVMS
+ #
+ # Maintainer: Zoltan Arpadffy <arpadffy at polarhome.com>
+! # Last change: 2006 Sep 04
+ #
+ # This has script been tested on VMS 6.2 to 8.2 on DEC Alpha, VAX and IA64
+ # with MMS and MMK
+***************
+*** 13,19 ****
+ #
+ # Edit the lines in the Configuration section below for fine tuning.
+ #
+! # To build: mms/descrip=Make_vms.mms
+ # To clean up: mms/descrip=Make_vms.mms clean
+ #
+ # Hints and detailed description could be found in INSTALLVMS.TXT file.
+--- 13,19 ----
+ #
+ # Edit the lines in the Configuration section below for fine tuning.
+ #
+! # To build: mms/descrip=Make_vms.mms /ignore=warning
+ # To clean up: mms/descrip=Make_vms.mms clean
+ #
+ # Hints and detailed description could be found in INSTALLVMS.TXT file.
+***************
+*** 21,30 ****
+ ######################################################################
+ # Configuration section.
+ ######################################################################
+- # Platform selection
+- # Define this if you will use the VAX platform to build.
+- # VAX = YES
+-
+ # VMS version
+ # Uncomment if you use VMS version 6.2 or older
+ # OLD_VMS = YES
+--- 21,26 ----
+***************
+*** 49,54 ****
+--- 45,51 ----
+
+ # GUI with GTK
+ # If you have GTK installed you might want to enable this option.
++ # NOTE: you will need to properly define GTK_DIR below
+ # GTK = YES
+
+ # GUI/Motif with XPM
+***************
+*** 97,103 ****
+
+ # Compiler setup
+
+! .IFDEF VAX
+ .IFDEF DECC # VAX with DECC
+ CC_DEF = cc # /decc # some system requires this switch
+ # but when it is not required /ver might fail
+--- 94,100 ----
+
+ # Compiler setup
+
+! .IFDEF MMSVAX
+ .IFDEF DECC # VAX with DECC
+ CC_DEF = cc # /decc # some system requires this switch
+ # but when it is not required /ver might fail
+***************
+*** 165,172 ****
+ # NOTE: you need to set up your GTK_DIR (GTK root directory), because it is
+ # unique on every system - logicals are not accepted
+ # please note: directory should end with . in order to /trans=conc work
+! # Example: GTK_DIR = $1$DGA104:[USERS.ZAY.WORK.GTK1210.]
+! GTK_DIR = DKA0:[GTK1210.]
+ DEFS = "HAVE_CONFIG_H","FEAT_GUI_GTK"
+ LIBS = ,OS_VMS_GTK.OPT/OPT
+ GUI_FLAG = /name=(as_is,short)/float=ieee/ieee=denorm
+--- 162,169 ----
+ # NOTE: you need to set up your GTK_DIR (GTK root directory), because it is
+ # unique on every system - logicals are not accepted
+ # please note: directory should end with . in order to /trans=conc work
+! # This value for GTK_DIR is an example.
+! GTK_DIR = $1$DGA104:[USERS.ZAY.WORK.GTK1210.]
+ DEFS = "HAVE_CONFIG_H","FEAT_GUI_GTK"
+ LIBS = ,OS_VMS_GTK.OPT/OPT
+ GUI_FLAG = /name=(as_is,short)/float=ieee/ieee=denorm
+***************
+*** 274,280 ****
+ # Please, do not change anything below without programming experience.
+ ######################################################################
+
+-
+ MODEL_DEF = "FEAT_$(MODEL)",
+
+ # These go into pathdef.c
+--- 271,276 ----
+***************
+*** 360,366 ****
+ -@ write pd "char_u *all_lflags = (char_u *)""$(LD_DEF)$(LDFLAGS) /exe=$(TARGET) *.OBJ $(ALL_LIBS)"";"
+ -@ write pd "char_u *compiler_version = (char_u *) ""''CC_VER'"";"
+ -@ write pd "char_u *compiled_user = (char_u *) "$(VIMUSER)";"
+! -@ write pd "char_u *compiled_sys = (char_u *) "$(VIMHOST)";"
+ -@ close pd
+
+ if_perl.c : if_perl.xs
+--- 356,363 ----
+ -@ write pd "char_u *all_lflags = (char_u *)""$(LD_DEF)$(LDFLAGS) /exe=$(TARGET) *.OBJ $(ALL_LIBS)"";"
+ -@ write pd "char_u *compiler_version = (char_u *) ""''CC_VER'"";"
+ -@ write pd "char_u *compiled_user = (char_u *) "$(VIMUSER)";"
+! -@ write pd "char_u *compiled_sys = (char_u *) "$(VIMHOST)";"
+! -@ write pd "char_u *compiled_arch = (char_u *) ""$(MMSARCH_NAME)"";"
+ -@ close pd
+
+ if_perl.c : if_perl.xs
+*** ../vim-7.0.170/src/buffer.c Tue Nov 7 22:41:37 2006
+--- src/buffer.c Tue Nov 7 21:08:02 2006
+***************
+*** 4145,4155 ****
+ /*
+ * Force expanding the path always for Unix, because symbolic links may
+ * mess up the full path name, even though it starts with a '/'.
+ * Also expand when there is ".." in the file name, try to remove it,
+ * because "c:/src/../README" is equal to "c:/README".
+ * For MS-Windows also expand names like "longna~1" to "longname".
+ */
+! #ifdef UNIX
+ return FullName_save(fname, TRUE);
+ #else
+ if (!vim_isAbsName(fname) || strstr((char *)fname, "..") != NULL
+--- 4145,4157 ----
+ /*
+ * Force expanding the path always for Unix, because symbolic links may
+ * mess up the full path name, even though it starts with a '/'.
++ * Also expand always for VMS, it may have alternate paths that need to be
++ * resolved.
+ * Also expand when there is ".." in the file name, try to remove it,
+ * because "c:/src/../README" is equal to "c:/README".
+ * For MS-Windows also expand names like "longna~1" to "longname".
+ */
+! #if defined(UNIX) || defined(VMS)
+ return FullName_save(fname, TRUE);
+ #else
+ if (!vim_isAbsName(fname) || strstr((char *)fname, "..") != NULL
+*** ../vim-7.0.170/src/os_unix.c Tue Aug 29 17:28:56 2006
+--- src/os_unix.c Tue Nov 28 17:38:54 2006
+***************
+*** 2202,2208 ****
+ #endif
+
+ /*
+! * Get absolute file name into buffer 'buf' of length 'len' bytes.
+ *
+ * return FAIL for failure, OK for success
+ */
+--- 2202,2208 ----
+ #endif
+
+ /*
+! * Get absolute file name into "buf[len]".
+ *
+ * return FAIL for failure, OK for success
+ */
+***************
+*** 2212,2233 ****
+ int len;
+ int force; /* also expand when already absolute path */
+ {
+ int l;
+! #ifdef OS2
+ int only_drive; /* file name is only a drive letter */
+! #endif
+! #ifdef HAVE_FCHDIR
+ int fd = -1;
+ static int dont_fchdir = FALSE; /* TRUE when fchdir() doesn't work */
+! #endif
+ char_u olddir[MAXPATHL];
+ char_u *p;
+ int retval = OK;
+
+- #ifdef VMS
+- fname = vms_fixfilename(fname);
+- #endif
+-
+ /* expand it if forced or not an absolute path */
+ if (force || !mch_isFullName(fname))
+ {
+--- 2212,2261 ----
+ int len;
+ int force; /* also expand when already absolute path */
+ {
++ #ifdef VMS
++ /*
++ * VMS does this in a completely different way.
++ *
++ * By default a file found in a complex path is written to the first
++ * directory in the path and not to the original directory. This
++ * behaviour should be avoided for the existing files and we need to find
++ * the exact path of the edited file.
++ */
++ if (force || !mch_isFullName(fname))
++ {
++ char_u *fixed_fname = vms_fixfilename(fname);
++ int fd = mch_open((char *)fixed_fname, O_RDONLY | O_EXTRA, 0);
++
++ if (fd > 0)
++ {
++ char nbuf[MAXNAMLEN];
++
++ /* File exists, use getname() to get the real name. */
++ if (getname(fd, nbuf))
++ vim_strncpy(fixed_fname, (char_u *)nbuf, (size_t)(len - 1));
++ close(fd);
++ }
++
++ if (STRLEN(fixed_fname) >= len)
++ return FAIL;
++
++ STRCPY(buf, fixed_fname);
++ }
++
++ #else /* not VMS */
++
+ int l;
+! # ifdef OS2
+ int only_drive; /* file name is only a drive letter */
+! # endif
+! # ifdef HAVE_FCHDIR
+ int fd = -1;
+ static int dont_fchdir = FALSE; /* TRUE when fchdir() doesn't work */
+! # endif
+ char_u olddir[MAXPATHL];
+ char_u *p;
+ int retval = OK;
+
+ /* expand it if forced or not an absolute path */
+ if (force || !mch_isFullName(fname))
+ {
+***************
+*** 2236,2251 ****
+ * and then do the getwd() (and get back to where we were).
+ * This will get the correct path name with "../" things.
+ */
+! #ifdef OS2
+ only_drive = 0;
+ if (((p = vim_strrchr(fname, '/')) != NULL)
+ || ((p = vim_strrchr(fname, '\\')) != NULL)
+ || (((p = vim_strchr(fname, ':')) != NULL) && ++only_drive))
+! #else
+ if ((p = vim_strrchr(fname, '/')) != NULL)
+! #endif
+ {
+! #ifdef HAVE_FCHDIR
+ /*
+ * Use fchdir() if possible, it's said to be faster and more
+ * reliable. But on SunOS 4 it might not work. Check this by
+--- 2264,2279 ----
+ * and then do the getwd() (and get back to where we were).
+ * This will get the correct path name with "../" things.
+ */
+! # ifdef OS2
+ only_drive = 0;
+ if (((p = vim_strrchr(fname, '/')) != NULL)
+ || ((p = vim_strrchr(fname, '\\')) != NULL)
+ || (((p = vim_strchr(fname, ':')) != NULL) && ++only_drive))
+! # else
+ if ((p = vim_strrchr(fname, '/')) != NULL)
+! # endif
+ {
+! # ifdef HAVE_FCHDIR
+ /*
+ * Use fchdir() if possible, it's said to be faster and more
+ * reliable. But on SunOS 4 it might not work. Check this by
+***************
+*** 2261,2274 ****
+ dont_fchdir = TRUE; /* don't try again */
+ }
+ }
+! #endif
+
+ /* Only change directory when we are sure we can return to where
+ * we are now. After doing "su" chdir(".") might not work. */
+ if (
+! #ifdef HAVE_FCHDIR
+ fd < 0 &&
+! #endif
+ (mch_dirname(olddir, MAXPATHL) == FAIL
+ || mch_chdir((char *)olddir) != 0))
+ {
+--- 2289,2302 ----
+ dont_fchdir = TRUE; /* don't try again */
+ }
+ }
+! # endif
+
+ /* Only change directory when we are sure we can return to where
+ * we are now. After doing "su" chdir(".") might not work. */
+ if (
+! # ifdef HAVE_FCHDIR
+ fd < 0 &&
+! # endif
+ (mch_dirname(olddir, MAXPATHL) == FAIL
+ || mch_chdir((char *)olddir) != 0))
+ {
+***************
+*** 2277,2283 ****
+ }
+ else
+ {
+! #ifdef OS2
+ /*
+ * compensate for case where ':' from "D:" was the only
+ * path separator detected in the file name; the _next_
+--- 2305,2311 ----
+ }
+ else
+ {
+! # ifdef OS2
+ /*
+ * compensate for case where ':' from "D:" was the only
+ * path separator detected in the file name; the _next_
+***************
+*** 2285,2291 ****
+ */
+ if (only_drive)
+ p++;
+! #endif
+ /* The directory is copied into buf[], to be able to remove
+ * the file name without changing it (could be a string in
+ * read-only memory) */
+--- 2313,2319 ----
+ */
+ if (only_drive)
+ p++;
+! # endif
+ /* The directory is copied into buf[], to be able to remove
+ * the file name without changing it (could be a string in
+ * read-only memory) */
+***************
+*** 2300,2313 ****
+ fname = p + 1;
+ *buf = NUL;
+ }
+! #ifdef OS2
+ if (only_drive)
+ {
+ p--;
+ if (retval != FAIL)
+ fname--;
+ }
+! #endif
+ }
+ }
+ if (mch_dirname(buf, len) == FAIL)
+--- 2328,2341 ----
+ fname = p + 1;
+ *buf = NUL;
+ }
+! # ifdef OS2
+ if (only_drive)
+ {
+ p--;
+ if (retval != FAIL)
+ fname--;
+ }
+! # endif
+ }
+ }
+ if (mch_dirname(buf, len) == FAIL)
+***************
+*** 2317,2330 ****
+ }
+ if (p != NULL)
+ {
+! #ifdef HAVE_FCHDIR
+ if (fd >= 0)
+ {
+ l = fchdir(fd);
+ close(fd);
+ }
+ else
+! #endif
+ l = mch_chdir((char *)olddir);
+ if (l != 0)
+ EMSG(_(e_prev_dir));
+--- 2345,2358 ----
+ }
+ if (p != NULL)
+ {
+! # ifdef HAVE_FCHDIR
+ if (fd >= 0)
+ {
+ l = fchdir(fd);
+ close(fd);
+ }
+ else
+! # endif
+ l = mch_chdir((char *)olddir);
+ if (l != 0)
+ EMSG(_(e_prev_dir));
+***************
+*** 2333,2347 ****
+ l = STRLEN(buf);
+ if (l >= len)
+ retval = FAIL;
+- #ifndef VMS
+ else
+ {
+ if (l > 0 && buf[l - 1] != '/' && *fname != NUL
+ && STRCMP(fname, ".") != 0)
+ STRCAT(buf, "/");
+ }
+- #endif
+ }
+ /* Catch file names which are too long. */
+ if (retval == FAIL || STRLEN(buf) + STRLEN(fname) >= len)
+ return FAIL;
+--- 2361,2374 ----
+ l = STRLEN(buf);
+ if (l >= len)
+ retval = FAIL;
+ else
+ {
+ if (l > 0 && buf[l - 1] != '/' && *fname != NUL
+ && STRCMP(fname, ".") != 0)
+ STRCAT(buf, "/");
+ }
+ }
++
+ /* Catch file names which are too long. */
+ if (retval == FAIL || STRLEN(buf) + STRLEN(fname) >= len)
+ return FAIL;
+***************
+*** 2349,2354 ****
+--- 2376,2383 ----
+ /* Do not append ".", "/dir/." is equal to "/dir". */
+ if (STRCMP(fname, ".") != 0)
+ STRCAT(buf, fname);
++
++ #endif /* VMS */
+
+ return OK;
+ }
+*** ../vim-7.0.170/src/version.c Tue Nov 28 17:18:03 2006
+--- src/version.c Tue Nov 28 17:35:05 2006
+***************
+*** 1113,1118 ****
+--- 1115,1128 ----
+ #endif
+ #ifdef VMS
+ MSG_PUTS("\nOpenVMS version");
++ # ifdef HAVE_PATHDEF
++ if (*compiled_arch != NUL)
++ {
++ MSG_PUTS(" - ");
++ MSG_PUTS(compiled_arch);
++ }
++ # endif
++
+ #endif
+
+ /* Print the list of patch numbers if there is at least one. */
+*** ../vim-7.0.170/src/version.c Tue Nov 28 17:18:03 2006
+--- src/version.c Tue Nov 28 17:35:05 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 171,
+ /**/
+
+--
+GUARD #1: What, ridden on a horse?
+ARTHUR: Yes!
+GUARD #1: You're using coconuts!
+ARTHUR: What?
+GUARD #1: You've got two empty halves of coconut and you're bangin' 'em
+ together.
+ 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.172
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.172?rev=815&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.172 (added)
+++ trunk/packages/vim/upstream/patches/7.0.172 Tue Nov 28 22:20:12 2006
@@ -1,0 +1,78 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.172
+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.172
+Problem: Crash when recovering and quitting at the "press-enter" prompt.
+Solution: Check for "msg_list" to be NULL. (Liu Yubao)
+Files: src/ex_eval.c
+
+
+*** ../vim-7.0.171/src/ex_eval.c Sun Apr 23 00:28:06 2006
+--- src/ex_eval.c Tue Nov 28 18:30:23 2006
+***************
+*** 340,346 ****
+
+ /* If no exception is to be thrown or the conversion should be done after
+ * returning to a previous invocation of do_one_cmd(), do nothing. */
+! if (*msg_list == NULL)
+ return;
+
+ if (throw_exception(*msg_list, ET_ERROR, cmdname) == FAIL)
+--- 340,346 ----
+
+ /* If no exception is to be thrown or the conversion should be done after
+ * returning to a previous invocation of do_one_cmd(), do nothing. */
+! if (msg_list == NULL || *msg_list == NULL)
+ return;
+
+ if (throw_exception(*msg_list, ET_ERROR, cmdname) == FAIL)
+***************
+*** 2026,2033 ****
+
+ /* If an error was about to be converted to an exception when
+ * enter_cleanup() was called, free the message list. */
+! free_msglist(*msg_list);
+! *msg_list = NULL;
+ }
+
+ /*
+--- 2026,2036 ----
+
+ /* If an error was about to be converted to an exception when
+ * enter_cleanup() was called, free the message list. */
+! if (msg_list != NULL)
+! {
+! free_msglist(*msg_list);
+! *msg_list = NULL;
+! }
+ }
+
+ /*
+*** ../vim-7.0.171/src/version.c Tue Nov 28 17:44:51 2006
+--- src/version.c Tue Nov 28 18:32:50 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 172,
+ /**/
+
+--
+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.173
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.173?rev=815&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.173 (added)
+++ trunk/packages/vim/upstream/patches/7.0.173 Tue Nov 28 22:20:12 2006
@@ -1,0 +1,57 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.173
+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.173
+Problem: ":call f().TT()" doesn't work. (Richard Emberson)
+Solution: When a function returns a Dictionary or another composite continue
+ evaluating what follows.
+Files: src/eval.c
+
+
+*** ../vim-7.0.172/src/eval.c Tue Nov 21 19:36:00 2006
+--- src/eval.c Tue Nov 28 20:50:02 2006
+***************
+*** 3184,3192 ****
+--- 3184,3201 ----
+ failed = TRUE;
+ break;
+ }
++
++ /* Handle a function returning a Funcref, Dictionary or List. */
++ if (handle_subscript(&arg, &rettv, !eap->skip, TRUE) == FAIL)
++ {
++ failed = TRUE;
++ break;
++ }
++
+ clear_tv(&rettv);
+ if (doesrange || eap->skip)
+ break;
++
+ /* Stop when immediately aborting on error, or when an interrupt
+ * occurred or an exception was thrown but not caught.
+ * get_func_tv() returned OK, so that the check for trailing
+*** ../vim-7.0.172/src/version.c Tue Nov 28 18:37:55 2006
+--- src/version.c Tue Nov 28 20:53:18 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 173,
+ /**/
+
+--
+"A mouse can be just as dangerous as a bullet or a bomb."
+ (US Representative Lamar Smith, R-Texas)
+
+ /// 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.174
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.174?rev=815&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.174 (added)
+++ trunk/packages/vim/upstream/patches/7.0.174 Tue Nov 28 22:20:12 2006
@@ -1,0 +1,95 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.174
+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.174
+Problem: ":mksession" doesn't restore window layout correctly in tab pages
+ other than the current one. (Zhibin He)
+Solution: Use the correct topframe for producing the window layout commands.
+Files: src/ex_docmd.c
+
+
+*** ../vim-7.0.173/src/ex_docmd.c Tue Nov 14 20:24:32 2006
+--- src/ex_docmd.c Tue Nov 28 21:32:41 2006
+***************
+*** 9675,9680 ****
+--- 9675,9681 ----
+ win_T *edited_win = NULL;
+ int tabnr;
+ win_T *tab_firstwin;
++ frame_T *tab_topframe;
+
+ if (ssop_flags & SSOP_BUFFERS)
+ only_save_windows = FALSE; /* Save ALL buffers */
+***************
+*** 9786,9791 ****
+--- 9787,9793 ----
+ * autocommands.
+ */
+ tab_firstwin = firstwin; /* first window in tab page "tabnr" */
++ tab_topframe = topframe;
+ for (tabnr = 1; ; ++tabnr)
+ {
+ int need_tabnew = FALSE;
+***************
+*** 9797,9805 ****
+--- 9799,9813 ----
+ if (tp == NULL)
+ break; /* done all tab pages */
+ if (tp == curtab)
++ {
+ tab_firstwin = firstwin;
++ tab_topframe = topframe;
++ }
+ else
++ {
+ tab_firstwin = tp->tp_firstwin;
++ tab_topframe = tp->tp_topframe;
++ }
+ if (tabnr > 1)
+ need_tabnew = TRUE;
+ }
+***************
+*** 9838,9844 ****
+ */
+ if (put_line(fd, "set splitbelow splitright") == FAIL)
+ return FAIL;
+! if (ses_win_rec(fd, topframe) == FAIL)
+ return FAIL;
+ if (!p_sb && put_line(fd, "set nosplitbelow") == FAIL)
+ return FAIL;
+--- 9846,9852 ----
+ */
+ if (put_line(fd, "set splitbelow splitright") == FAIL)
+ return FAIL;
+! if (ses_win_rec(fd, tab_topframe) == FAIL)
+ return FAIL;
+ if (!p_sb && put_line(fd, "set nosplitbelow") == FAIL)
+ return FAIL;
+*** ../vim-7.0.173/src/version.c Tue Nov 28 20:54:32 2006
+--- src/version.c Tue Nov 28 21:40:07 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 174,
+ /**/
+
+--
+ARTHUR: Well, it doesn't matter. Will you go and tell your master that
+ Arthur from the Court of Camelot is here.
+GUARD #1: Listen, in order to maintain air-speed velocity, a swallow
+ needs to beat its wings 43 times every second, right?
+ARTHUR: Please!
+ 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