r1235 - in /trunk/packages/vim: debian/README debian/changelog patches/option.c-langmap_comma.diff upstream/patches/7.1.278 upstream/patches/7.1.279 upstream/patches/7.1.280
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Sat Mar 15 15:55:12 UTC 2008
Author: jamessan
Date: Sat Mar 15 15:55:12 2008
New Revision: 1235
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1235
Log:
Upstream patches 278 - 280. Refresh option.c-langmap_comma.diff
Added:
trunk/packages/vim/upstream/patches/7.1.278
trunk/packages/vim/upstream/patches/7.1.279
trunk/packages/vim/upstream/patches/7.1.280
Modified:
trunk/packages/vim/debian/README
trunk/packages/vim/debian/changelog
trunk/packages/vim/patches/option.c-langmap_comma.diff
Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=1235&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Sat Mar 15 15:55:12 2008
@@ -309,3 +309,6 @@
40835 7.1.275 (extra) Mac: ATSUI and 'antialias' don't work together
4946 7.1.276 "gw" uses 'formatexpr', even though the docs say it doesn't
2802 7.1.277 default for 'paragraphs' misses some items
+ 1989 7.1.278 (extra, after 7.1.275) build problem
+ 3848 7.1.279 when using cscope temporary files are left behind
+ 1556 7.1.280 (after 7.1.275) Mac: build problems without multibyte feature
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=1235&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Sat Mar 15 15:55:12 2008
@@ -1,6 +1,6 @@
-vim (1:7.1-277+1) UNRELEASED; urgency=low
-
- * New upstream patches (267 - 277), see README.gz for details.
+vim (1:7.1-280+1) UNRELEASED; urgency=low
+
+ * New upstream patches (267 - 280), see README.gz for details.
- 7.1.277 adds recognition of a few extra groff macros (TP, HP, Pp, Lp,
and It) in the default 'paragraphs' option. (Closes: #468924)
* Updated patches:
Modified: trunk/packages/vim/patches/option.c-langmap_comma.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/option.c-langmap_comma.diff?rev=1235&op=diff
==============================================================================
--- trunk/packages/vim/patches/option.c-langmap_comma.diff (original)
+++ trunk/packages/vim/patches/option.c-langmap_comma.diff Sat Mar 15 15:55:12 2008
@@ -2,7 +2,7 @@
===================================================================
--- vim/src/option.c.orig
+++ vim/src/option.c
-@@ -10134,7 +10134,7 @@
+@@ -10135,7 +10135,7 @@
{
char_u *p;
char_u *p2;
@@ -11,7 +11,7 @@
langmap_init(); /* back to one-to-one map first */
-@@ -10152,6 +10152,11 @@
+@@ -10153,6 +10153,11 @@
p2 = NULL; /* aAbBcCdD form, p2 is NULL */
while (p[0])
{
@@ -23,7 +23,7 @@
if (p[0] == '\\' && p[1] != NUL)
++p;
#ifdef FEAT_MBYTE
-@@ -10162,23 +10167,29 @@
+@@ -10163,23 +10168,29 @@
if (p2 == NULL)
{
mb_ptr_adv(p);
Added: trunk/packages/vim/upstream/patches/7.1.278
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.278?rev=1235&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.278 (added)
+++ trunk/packages/vim/upstream/patches/7.1.278 Sat Mar 15 15:55:12 2008
@@ -1,0 +1,62 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.278
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.278 (extra, after 7.1.275)
+Problem: Build failure when USE_CARBONKEYHANDLER is not defined.
+Solution: Remove #ifdef.
+Files: src/gui_mac.c
+
+
+*** ../vim-7.1.277/src/gui_mac.c Wed Mar 12 14:38:51 2008
+--- src/gui_mac.c Wed Mar 12 21:40:54 2008
+***************
+*** 3037,3049 ****
+ gui_mch_init(void)
+ {
+ /* TODO: Move most of this stuff toward gui_mch_init */
+! Rect windRect;
+! MenuHandle pomme;
+ EventHandlerRef mouseWheelHandlerRef;
+- #ifdef USE_CARBONKEYHANDLER
+ EventTypeSpec eventTypeSpec;
+! #endif
+! ControlRef rootControl;
+
+ if (Gestalt(gestaltSystemVersion, &gMacSystemVersion) != noErr)
+ gMacSystemVersion = 0x1000; /* TODO: Default to minimum sensible value */
+--- 3040,3050 ----
+ gui_mch_init(void)
+ {
+ /* TODO: Move most of this stuff toward gui_mch_init */
+! Rect windRect;
+! MenuHandle pomme;
+ EventHandlerRef mouseWheelHandlerRef;
+ EventTypeSpec eventTypeSpec;
+! ControlRef rootControl;
+
+ if (Gestalt(gestaltSystemVersion, &gMacSystemVersion) != noErr)
+ gMacSystemVersion = 0x1000; /* TODO: Default to minimum sensible value */
+*** ../vim-7.1.277/src/version.c Wed Mar 12 17:37:53 2008
+--- src/version.c Wed Mar 12 21:43:22 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 278,
+ /**/
+
+--
+Would you care for a drink? I mean, if it were, like,
+disabled and you had to look after it?
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.279
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.279?rev=1235&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.279 (added)
+++ trunk/packages/vim/upstream/patches/7.1.279 Sat Mar 15 15:55:12 2008
@@ -1,0 +1,146 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.279
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.279
+Problem: When using cscope temporary files are left behind.
+Solution: Send the quit command to cscope and give it two seconds to exit
+ nicely before killing it. (partly by Dominique Pelle)
+Files: src/if_cscope.c
+
+
+*** ../vim-7.1.278/src/if_cscope.c Fri Sep 14 19:56:18 2007
+--- src/if_cscope.c Sat Mar 15 12:38:12 2008
+***************
+*** 2096,2101 ****
+--- 2096,2113 ----
+ return CSCOPE_SUCCESS;
+ }
+
++ #if defined(UNIX) && defined(SIGALRM)
++ /*
++ * Used to catch and ignore SIGALRM below.
++ */
++ /* ARGSUSED */
++ static RETSIGTYPE
++ sig_handler SIGDEFARG(sigarg)
++ {
++ /* do nothing */
++ SIGRETURN;
++ }
++ #endif
+
+ /*
+ * PRIVATE: cs_release_csp
+***************
+*** 2108,2116 ****
+ int i;
+ int freefnpp;
+ {
+- #if defined(UNIX)
+- int pstat;
+- #else
+ /*
+ * Trying to exit normally (not sure whether it is fit to UNIX cscope
+ */
+--- 2120,2125 ----
+***************
+*** 2119,2124 ****
+--- 2128,2179 ----
+ (void)fputs("q\n", csinfo[i].to_fp);
+ (void)fflush(csinfo[i].to_fp);
+ }
++ #if defined(UNIX)
++ {
++ int pstat;
++ pid_t pid;
++
++ # if defined(HAVE_SIGACTION)
++ struct sigaction sa, old;
++
++ /* Use sigaction() to limit the waiting time to two seconds. */
++ sa.sa_handler = sig_handler;
++ sa.sa_flags = SA_NODEFER;
++ sigaction(SIGALRM, &sa, &old);
++ alarm(2); /* 2 sec timeout */
++
++ /* Block until cscope exits or until timer expires */
++ pid = waitpid(csinfo[i].pid, &pstat, 0);
++
++ /* cancel pending alarm if still there and restore signal */
++ alarm(0);
++ sigaction(SIGALRM, &old, NULL);
++ # else
++ int waited;
++
++ /* Can't use sigaction(), loop for two seconds. First yield the CPU
++ * to give cscope a chance to exit quickly. */
++ sleep(0);
++ for (waited = 0; waited < 40; ++waited)
++ {
++ pid = waitpid(csinfo[i].pid, &pstat, WNOHANG);
++ if (pid != 0)
++ break; /* break unless the process is still running */
++ mch_delay(50, FALSE); /* sleep 50 ms */
++ }
++ # endif
++ /*
++ * If the cscope process is still running: kill it.
++ * Safety check: If the PID would be zero here, the entire X session
++ * would be killed. -1 and 1 are dangerous as well.
++ */
++ if (pid < 0 && csinfo[i].pid > 1)
++ {
++ kill(csinfo[i].pid, SIGTERM);
++ (void)waitpid(csinfo[i].pid, &pstat, 0);
++ }
++ }
++ #else /* !UNIX */
+ if (csinfo[i].hProc != NULL)
+ {
+ /* Give cscope a chance to exit normally */
+***************
+*** 2133,2150 ****
+ if (csinfo[i].to_fp != NULL)
+ (void)fclose(csinfo[i].to_fp);
+
+- /*
+- * Safety check: If the PID would be zero here, the entire X session would
+- * be killed. -1 and 1 are dangerous as well.
+- */
+- #if defined(UNIX)
+- if (csinfo[i].pid > 1)
+- {
+- kill(csinfo[i].pid, SIGTERM);
+- (void)waitpid(csinfo[i].pid, &pstat, 0);
+- }
+- #endif
+-
+ if (freefnpp)
+ {
+ vim_free(csinfo[i].fname);
+--- 2188,2193 ----
+*** ../vim-7.1.278/src/version.c Wed Mar 12 21:47:31 2008
+--- src/version.c Sat Mar 15 12:38:58 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 279,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+130. You can't get out of your desk even if it's time to eat or time
+ to go to the bathroom.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net \\\
+/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\ download, build and distribute -- http://www.A-A-P.org ///
+ \\\ help me help AIDS victims -- http://ICCF-Holland.org ///
Added: trunk/packages/vim/upstream/patches/7.1.280
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.1.280?rev=1235&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.1.280 (added)
+++ trunk/packages/vim/upstream/patches/7.1.280 Sat Mar 15 15:55:12 2008
@@ -1,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 7.1.280
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.1.280 (after 7.1.275)
+Problem: Mac: build problems when not using multibyte feature. (Nicholas
+ Stallard)
+Solution: Don't define USE_IM_CONTROL when not using multibyte.
+Files: src/vim.h
+
+
+*** ../vim-7.1.279/src/vim.h Wed Mar 12 17:25:50 2008
+--- src/vim.h Thu Mar 13 23:39:21 2008
+***************
+*** 463,469 ****
+ */
+ #if defined(FEAT_XIM) \
+ || (defined(FEAT_GUI) && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
+! || defined(FEAT_GUI_MAC)
+ # define USE_IM_CONTROL
+ #endif
+
+--- 466,472 ----
+ */
+ #if defined(FEAT_XIM) \
+ || (defined(FEAT_GUI) && (defined(FEAT_MBYTE_IME) || defined(GLOBAL_IME))) \
+! || (defined(FEAT_GUI_MAC) && defined(FEAT_MBYTE))
+ # define USE_IM_CONTROL
+ #endif
+
+*** ../vim-7.1.279/src/version.c Sat Mar 15 12:40:23 2008
+--- src/version.c Sat Mar 15 13:08:40 2008
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 280,
+ /**/
+
+--
+Why is it called "Windows"? "Gates" would be more appropriate...
+
+ /// 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