packages: vim/vim.spec, vim/7.3.090 (NEW), vim/7.3.091 (NEW), vim/7.3.092 (...
glen
glen at pld-linux.org
Mon Jan 3 14:52:26 CET 2011
Author: glen Date: Mon Jan 3 13:52:26 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- autoup to 7.3.094
---- Files affected:
packages/vim:
vim.spec (1.538 -> 1.539) , 7.3.090 (NONE -> 1.1) (NEW), 7.3.091 (NONE -> 1.1) (NEW), 7.3.092 (NONE -> 1.1) (NEW), 7.3.093 (NONE -> 1.1) (NEW), 7.3.094 (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/vim/vim.spec
diff -u packages/vim/vim.spec:1.538 packages/vim/vim.spec:1.539
--- packages/vim/vim.spec:1.538 Sun Jan 2 21:57:40 2011
+++ packages/vim/vim.spec Mon Jan 3 14:52:21 2011
@@ -28,7 +28,7 @@
# curl -s ftp://ftp.vim.org/pub/editors/vim/patches/7.3/MD5SUMS | grep -vF .gz | tail -n1 | awk '{print $2}'
%define ver 7.3
-%define patchlevel 089
+%define patchlevel 094
%define rel 1
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
@@ -1378,6 +1378,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.539 2011/01/03 13:52:21 glen
+- autoup to 7.3.094
+
Revision 1.538 2011/01/02 20:57:40 glen
- merge -gzhelp.patch into -vimrc.patch
================================================================
Index: packages/vim/7.3.090
diff -u /dev/null packages/vim/7.3.090:1.1
--- /dev/null Mon Jan 3 14:52:27 2011
+++ packages/vim/7.3.090 Mon Jan 3 14:52:21 2011
@@ -0,0 +1,68 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.090
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.090
+Problem: Wrong help text for Cscope.
+Solution: Adjust the help text for "t". (Dominique Pelle)
+Files: src/if_cscope.c
+
+
+*** ../vim-7.3.089/src/if_cscope.c 2010-12-17 20:23:56.000000000 +0100
+--- src/if_cscope.c 2010-12-30 11:35:37.000000000 +0100
+***************
+*** 1346,1352 ****
+ " g: Find this definition\n"
+ " i: Find files #including this file\n"
+ " s: Find this C symbol\n"
+! " t: Find assignments to\n"));
+
+ cmdp++;
+ }
+--- 1346,1352 ----
+ " g: Find this definition\n"
+ " i: Find files #including this file\n"
+ " s: Find this C symbol\n"
+! " t: Find this text string\n"));
+
+ cmdp++;
+ }
+***************
+*** 1657,1663 ****
+ /*
+ * PRIVATE: cs_make_vim_style_matches
+ *
+! * convert the cscope output into into a ctags style entry (as might be found
+ * in a ctags tags file). there's one catch though: cscope doesn't tell you
+ * the type of the tag you are looking for. for example, in Darren Hiebert's
+ * ctags (the one that comes with vim), #define's use a line number to find the
+--- 1657,1663 ----
+ /*
+ * PRIVATE: cs_make_vim_style_matches
+ *
+! * convert the cscope output into a ctags style entry (as might be found
+ * in a ctags tags file). there's one catch though: cscope doesn't tell you
+ * the type of the tag you are looking for. for example, in Darren Hiebert's
+ * ctags (the one that comes with vim), #define's use a line number to find the
+*** ../vim-7.3.089/src/version.c 2010-12-24 14:00:09.000000000 +0100
+--- src/version.c 2010-12-30 11:36:33.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 90,
+ /**/
+
+--
+ERROR 047: Keyboard not found. Press RETURN to continue.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ an exciting new programming language -- http://www.Zimbu.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.3.091
diff -u /dev/null packages/vim/7.3.091:1.1
--- /dev/null Mon Jan 3 14:52:27 2011
+++ packages/vim/7.3.091 Mon Jan 3 14:52:21 2011
@@ -0,0 +1,321 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.091
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.091
+Problem: "vim -w foo" writes special key codes for removed escape
+ sequences. (Josh Triplett)
+Solution: Don't write K_IGNORE codes.
+Files: src/getchar.c, src/misc1.c, src/term.c, src/vim.h
+
+
+*** ../vim-7.3.090/src/getchar.c 2010-10-27 17:39:00.000000000 +0200
+--- src/getchar.c 2010-12-30 12:16:36.000000000 +0100
+***************
+*** 1506,1514 ****
+ }
+ }
+
+- #define KL_PART_KEY -1 /* keylen value for incomplete key-code */
+- #define KL_PART_MAP -2 /* keylen value for incomplete mapping */
+-
+ /*
+ * Get the next input character.
+ * Can return a special key or a multi-byte character.
+--- 1506,1511 ----
+***************
+*** 2171,2177 ****
+ if (!timedout)
+ {
+ /* break at a partly match */
+! keylen = KL_PART_MAP;
+ break;
+ }
+ }
+--- 2168,2174 ----
+ if (!timedout)
+ {
+ /* break at a partly match */
+! keylen = KEYLEN_PART_MAP;
+ break;
+ }
+ }
+***************
+*** 2192,2198 ****
+
+ /* If no partly match found, use the longest full
+ * match. */
+! if (keylen != KL_PART_MAP)
+ {
+ mp = mp_match;
+ keylen = mp_match_len;
+--- 2189,2195 ----
+
+ /* If no partly match found, use the longest full
+ * match. */
+! if (keylen != KEYLEN_PART_MAP)
+ {
+ mp = mp_match;
+ keylen = mp_match_len;
+***************
+*** 2230,2236 ****
+ }
+ /* Need more chars for partly match. */
+ if (mlen == typebuf.tb_len)
+! keylen = KL_PART_KEY;
+ else if (max_mlen < mlen)
+ /* no match, may have to check for termcode at
+ * next character */
+--- 2227,2233 ----
+ }
+ /* Need more chars for partly match. */
+ if (mlen == typebuf.tb_len)
+! keylen = KEYLEN_PART_KEY;
+ else if (max_mlen < mlen)
+ /* no match, may have to check for termcode at
+ * next character */
+***************
+*** 2238,2244 ****
+ }
+
+ if ((mp == NULL || max_mlen >= mp_match_len)
+! && keylen != KL_PART_MAP)
+ {
+ int save_keylen = keylen;
+
+--- 2235,2241 ----
+ }
+
+ if ((mp == NULL || max_mlen >= mp_match_len)
+! && keylen != KEYLEN_PART_MAP)
+ {
+ int save_keylen = keylen;
+
+***************
+*** 2264,2271 ****
+ /* If no termcode matched but 'pastetoggle'
+ * matched partially it's like an incomplete key
+ * sequence. */
+! if (keylen == 0 && save_keylen == KL_PART_KEY)
+! keylen = KL_PART_KEY;
+
+ /*
+ * When getting a partial match, but the last
+--- 2261,2268 ----
+ /* If no termcode matched but 'pastetoggle'
+ * matched partially it's like an incomplete key
+ * sequence. */
+! if (keylen == 0 && save_keylen == KEYLEN_PART_KEY)
+! keylen = KEYLEN_PART_KEY;
+
+ /*
+ * When getting a partial match, but the last
+***************
+*** 2302,2308 ****
+ continue;
+ }
+ if (*s == NUL) /* need more characters */
+! keylen = KL_PART_KEY;
+ }
+ if (keylen >= 0)
+ #endif
+--- 2299,2305 ----
+ continue;
+ }
+ if (*s == NUL) /* need more characters */
+! keylen = KEYLEN_PART_KEY;
+ }
+ if (keylen >= 0)
+ #endif
+***************
+*** 2339,2345 ****
+ if (keylen > 0) /* full matching terminal code */
+ {
+ #if defined(FEAT_GUI) && defined(FEAT_MENU)
+! if (typebuf.tb_buf[typebuf.tb_off] == K_SPECIAL
+ && typebuf.tb_buf[typebuf.tb_off + 1]
+ == KS_MENU)
+ {
+--- 2336,2343 ----
+ if (keylen > 0) /* full matching terminal code */
+ {
+ #if defined(FEAT_GUI) && defined(FEAT_MENU)
+! if (typebuf.tb_len >= 2
+! && typebuf.tb_buf[typebuf.tb_off] == K_SPECIAL
+ && typebuf.tb_buf[typebuf.tb_off + 1]
+ == KS_MENU)
+ {
+***************
+*** 2381,2387 ****
+ /* Partial match: get some more characters. When a
+ * matching mapping was found use that one. */
+ if (mp == NULL || keylen < 0)
+! keylen = KL_PART_KEY;
+ else
+ keylen = mp_match_len;
+ }
+--- 2379,2385 ----
+ /* Partial match: get some more characters. When a
+ * matching mapping was found use that one. */
+ if (mp == NULL || keylen < 0)
+! keylen = KEYLEN_PART_KEY;
+ else
+ keylen = mp_match_len;
+ }
+***************
+*** 2553,2559 ****
+ #endif
+ && typebuf.tb_maplen == 0
+ && (State & INSERT)
+! && (p_timeout || (keylen == KL_PART_KEY && p_ttimeout))
+ && (c = inchar(typebuf.tb_buf + typebuf.tb_off
+ + typebuf.tb_len, 3, 25L,
+ typebuf.tb_change_cnt)) == 0)
+--- 2551,2558 ----
+ #endif
+ && typebuf.tb_maplen == 0
+ && (State & INSERT)
+! && (p_timeout
+! || (keylen == KEYLEN_PART_KEY && p_ttimeout))
+ && (c = inchar(typebuf.tb_buf + typebuf.tb_off
+ + typebuf.tb_len, 3, 25L,
+ typebuf.tb_change_cnt)) == 0)
+***************
+*** 2783,2791 ****
+ ? 0
+ : ((typebuf.tb_len == 0
+ || !(p_timeout || (p_ttimeout
+! && keylen == KL_PART_KEY)))
+ ? -1L
+! : ((keylen == KL_PART_KEY && p_ttm >= 0)
+ ? p_ttm
+ : p_tm)), typebuf.tb_change_cnt);
+
+--- 2782,2790 ----
+ ? 0
+ : ((typebuf.tb_len == 0
+ || !(p_timeout || (p_ttimeout
+! && keylen == KEYLEN_PART_KEY)))
+ ? -1L
+! : ((keylen == KEYLEN_PART_KEY && p_ttm >= 0)
+ ? p_ttm
+ : p_tm)), typebuf.tb_change_cnt);
+
+*** ../vim-7.3.090/src/misc1.c 2010-12-02 16:01:23.000000000 +0100
+--- src/misc1.c 2010-12-30 12:28:59.000000000 +0100
+***************
+*** 3114,3123 ****
+ && (!p_ttimeout || waited * 100L < (p_ttm < 0 ? p_tm : p_ttm)))
+ continue;
+
+! /* found a termcode: adjust length */
+! if (n > 0)
+ len = n;
+! if (len == 0) /* nothing typed yet */
+ continue;
+
+ /* Handle modifier and/or special key code. */
+--- 3114,3124 ----
+ && (!p_ttimeout || waited * 100L < (p_ttm < 0 ? p_tm : p_ttm)))
+ continue;
+
+! if (n == KEYLEN_REMOVED) /* key code removed */
+! continue;
+! if (n > 0) /* found a termcode: adjust length */
+ len = n;
+! if (len == 0) /* nothing typed yet */
+ continue;
+
+ /* Handle modifier and/or special key code. */
+*** ../vim-7.3.090/src/term.c 2010-08-15 21:57:32.000000000 +0200
+--- src/term.c 2010-12-30 12:14:48.000000000 +0100
+***************
+*** 3828,3833 ****
+--- 3831,3837 ----
+ * Check from typebuf.tb_buf[typebuf.tb_off] to typebuf.tb_buf[typebuf.tb_off
+ * + max_offset].
+ * Return 0 for no match, -1 for partial match, > 0 for full match.
++ * Return KEYLEN_REMOVED when a key code was deleted.
+ * With a match, the match is removed, the replacement code is inserted in
+ * typebuf.tb_buf[] and the number of characters in typebuf.tb_buf[] is
+ * returned.
+***************
+*** 3845,3850 ****
+--- 3849,3855 ----
+ int slen = 0; /* init for GCC */
+ int modslen;
+ int len;
++ int retval = 0;
+ int offset;
+ char_u key_name[2];
+ int modifiers;
+***************
+*** 4940,4945 ****
+--- 4945,4957 ----
+ #endif
+ string[new_slen++] = key_name[1];
+ }
++ else if (new_slen == 0 && key_name[0] == KS_EXTRA
++ && key_name[1] == KE_IGNORE)
++ {
++ /* Do not put K_IGNORE into the buffer, do return KEYLEN_REMOVED
++ * to indicate what happened. */
++ retval = KEYLEN_REMOVED;
++ }
+ else
+ {
+ string[new_slen++] = K_SPECIAL;
+***************
+*** 4976,4982 ****
+ (size_t)(buflen - offset));
+ mch_memmove(buf + offset, string, (size_t)new_slen);
+ }
+! return (len + extra + offset);
+ }
+
+ return 0; /* no match found */
+--- 4988,4994 ----
+ (size_t)(buflen - offset));
+ mch_memmove(buf + offset, string, (size_t)new_slen);
+ }
+! return retval == 0 ? (len + extra + offset) : retval;
+ }
+
+ return 0; /* no match found */
+*** ../vim-7.3.090/src/vim.h 2010-12-17 20:23:56.000000000 +0100
+--- src/vim.h 2010-12-30 12:06:45.000000000 +0100
+***************
+*** 2211,2214 ****
+--- 2211,2218 ----
+ #define MSCR_LEFT -1
+ #define MSCR_RIGHT -2
+
++ #define KEYLEN_PART_KEY -1 /* keylen value for incomplete key-code */
++ #define KEYLEN_PART_MAP -2 /* keylen value for incomplete mapping */
++ #define KEYLEN_REMOVED 9999 /* keylen value for removed sequence */
++
+ #endif /* VIM__H */
+*** ../vim-7.3.090/src/version.c 2010-12-30 11:41:05.000000000 +0100
+--- src/version.c 2010-12-30 12:24:56.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 91,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+56. You leave the modem speaker on after connecting because you think it
+ sounds like the ocean wind...the perfect soundtrack for "surfing the net".
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ an exciting new programming language -- http://www.Zimbu.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.3.092
diff -u /dev/null packages/vim/7.3.092:1.1
--- /dev/null Mon Jan 3 14:52:27 2011
+++ packages/vim/7.3.092 Mon Jan 3 14:52:21 2011
@@ -0,0 +1,62 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.092
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.092
+Problem: Resizing the window when exiting.
+Solution: Don't resize when exiting.
+Files: src/term.c
+
+
+*** ../vim-7.3.091/src/term.c 2010-12-30 12:30:26.000000000 +0100
+--- src/term.c 2010-12-30 12:14:48.000000000 +0100
+***************
+*** 3053,3062 ****
+ int old_Rows = Rows;
+ int old_Columns = Columns;
+
+! (void)ui_get_shellsize();
+! check_shellsize();
+! if (old_Rows != Rows || old_Columns != Columns)
+! shell_resized();
+ }
+
+ /*
+--- 3053,3065 ----
+ int old_Rows = Rows;
+ int old_Columns = Columns;
+
+! if (!exiting)
+! {
+! (void)ui_get_shellsize();
+! check_shellsize();
+! if (old_Rows != Rows || old_Columns != Columns)
+! shell_resized();
+! }
+ }
+
+ /*
+*** ../vim-7.3.091/src/version.c 2010-12-30 12:30:26.000000000 +0100
+--- src/version.c 2010-12-30 14:47:04.000000000 +0100
+***************
+*** 716,717 ****
+--- 716,719 ----
+ { /* Add new patch number below this line */
++ /**/
++ 92,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+57. You begin to wonder how on earth your service provider is allowed to call
+ 200 hours per month "unlimited."
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ an exciting new programming language -- http://www.Zimbu.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
================================================================
Index: packages/vim/7.3.093
diff -u /dev/null packages/vim/7.3.093:1.1
--- /dev/null Mon Jan 3 14:52:27 2011
+++ packages/vim/7.3.093 Mon Jan 3 14:52:21 2011
@@ -0,0 +1,201 @@
+To: vim_dev at googlegroups.com
+Subject: Patch 7.3.093
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.3.093
+Problem: New DLL dependencies in MingW with gcc 4.5.0.
+Solution: Add STATIC_STDCPLUS, LDFLAGS and split up WINDRES. (Guopeng Wen)
+Files: src/GvimExt/Make_ming.mak, src/Make_ming.mak
+
+
+*** ../vim-7.3.092/src/GvimExt/Make_ming.mak 2010-09-29 18:42:25.000000000 +0200
+--- src/GvimExt/Make_ming.mak 2010-12-30 14:42:51.000000000 +0100
+***************
+*** 17,22 ****
+--- 17,33 ----
+ # check also the executables
+ MINGWOLD = no
+
++ # Link against the shared versions of libgcc/libstdc++ by default. Set
++ # STATIC_STDCPLUS to "yes" to link against static versions instead.
++ STATIC_STDCPLUS=no
++ #STATIC_STDCPLUS=yes
++
++ # Note: -static-libstdc++ is not available until gcc 4.5.x.
++ LDFLAGS += -shared
++ ifeq (yes, $(STATIC_STDCPLUS))
++ LDFLAGS += -static-libgcc -static-libstdc++
++ endif
++
+ ifeq ($(CROSS),yes)
+ DEL = rm
+ ifeq ($(MINGWOLD),yes)
+***************
+*** 33,39 ****
+ endif
+ endif
+ CXX := $(CROSS_COMPILE)g++
+! WINDRES := $(CROSS_COMPILE)windres --preprocessor="$(CXX) -E -xc" -DRC_INVOKED
+ LIBS := -luuid
+ RES := gvimext.res
+ DEFFILE = gvimext_ming.def
+--- 44,52 ----
+ endif
+ endif
+ CXX := $(CROSS_COMPILE)g++
+! WINDRES := $(CROSS_COMPILE)windres
+! WINDRES_CXX = $(CXX)
+! WINDRES_FLAGS = --preprocessor="$(WINDRES_CXX) -E -xc" -DRC_INVOKED
+ LIBS := -luuid
+ RES := gvimext.res
+ DEFFILE = gvimext_ming.def
+***************
+*** 46,52 ****
+ all: all-before $(DLL) all-after
+
+ $(DLL): $(OBJ) $(RES) $(DEFFILE)
+! $(CXX) -shared $(CXXFLAGS) -s -o $@ \
+ -Wl,--enable-auto-image-base \
+ -Wl,--enable-auto-import \
+ -Wl,--whole-archive \
+--- 59,65 ----
+ all: all-before $(DLL) all-after
+
+ $(DLL): $(OBJ) $(RES) $(DEFFILE)
+! $(CXX) $(LDFLAGS) $(CXXFLAGS) -s -o $@ \
+ -Wl,--enable-auto-image-base \
+ -Wl,--enable-auto-import \
+ -Wl,--whole-archive \
+***************
+*** 58,64 ****
+ $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@
+
+ $(RES): gvimext_ming.rc
+! $(WINDRES) --input-format=rc --output-format=coff -DMING $? -o $@
+
+ clean: clean-custom
+ -$(DEL) $(OBJ) $(RES) $(DLL)
+--- 71,77 ----
+ $(CXX) $(CXXFLAGS) -DFEAT_GETTEXT -c $? -o $@
+
+ $(RES): gvimext_ming.rc
+! $(WINDRES) $(WINDRES_FLAGS) --input-format=rc --output-format=coff -DMING $? -o $@
+
+ clean: clean-custom
+ -$(DEL) $(OBJ) $(RES) $(DLL)
+*** ../vim-7.3.092/src/Make_ming.mak 2010-11-03 21:59:23.000000000 +0100
+--- src/Make_ming.mak 2010-12-30 14:42:51.000000000 +0100
+***************
+*** 56,61 ****
+--- 56,67 ----
+ NETBEANS=$(GUI)
+
+
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/vim/vim.spec?r1=1.538&r2=1.539&f=u
More information about the pld-cvs-commit
mailing list