r666 - in /trunk/packages/vim: debian/changelog debian/rules
upstream/patches/7.0.013 upstream/patches/7.0.014 upstream/patches/7.0.015
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Fri May 12 18:26:31 UTC 2006
Author: zack
Date: Fri May 12 18:26:28 2006
New Revision: 666
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=666
Log:
added upstream patches 013, 014, 015
Added:
trunk/packages/vim/upstream/patches/7.0.013
trunk/packages/vim/upstream/patches/7.0.014
trunk/packages/vim/upstream/patches/7.0.015
Modified:
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/rules
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=666&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Fri May 12 18:26:28 2006
@@ -1,7 +1,7 @@
vim (1:7.0-012+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
- * New upstream patches (011 - 012), see README.gz for details.
+ * New upstream patches (011 - 015), see README.gz for details.
[ Stefano Zacchiroli ]
* Preliminary support for add-on infrastructure
@@ -10,7 +10,7 @@
+ added dir /var/lib/vim/addons/, now in the runtimepath
+ added vim add-on registry entry for the matchit plugin
- -- James Vega <jamessan at debian.org> Thu, 11 May 2006 13:45:36 -0400
+ -- James Vega <jamessan at debian.org> Thu, 12 May 2006 13:45:36 -0400
vim (1:7.0-010+1) experimental; urgency=low
Modified: trunk/packages/vim/debian/rules
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/rules?rev=666&op=diff
==============================================================================
--- trunk/packages/vim/debian/rules (original)
+++ trunk/packages/vim/debian/rules Fri May 12 18:26:28 2006
@@ -163,7 +163,6 @@
NAME=vim
VERSION=7.0
DEBVERSION=$(VERSION)
-PATCH=000
VIMCUR=$(NAME)$(subst .,,$(VERSION))
SRCDIR=$(VIMCUR)
CHANGELOG=$(SRCDIR)/runtime/doc/version7.txt # latest version upstream changelog
Added: trunk/packages/vim/upstream/patches/7.0.013
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.013?rev=666&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.013 (added)
+++ trunk/packages/vim/upstream/patches/7.0.013 Fri May 12 18:26:28 2006
@@ -1,0 +1,154 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.013
+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.013
+Problem: Insert mode completion: using CTRL-L to add an extra character
+ also deselects the current match, making it impossible to use
+ CTRL-L a second time.
+Solution: Keep the current match. Also make CTRL-L work at the original
+ text, using the first displayed match.
+Files: src/edit.c
+
+
+*** ../vim-7.0.012/src/edit.c Wed May 10 15:22:49 2006
+--- src/edit.c Thu May 11 10:38:54 2006
+***************
+*** 751,757 ****
+ continue;
+ }
+
+! /* Pressing CTRL-Y selects the current match. Shen
+ * compl_enter_selects is set the Enter key does the same. */
+ if (c == Ctrl_Y || (compl_enter_selects
+ && (c == CAR || c == K_KENTER || c == NL)))
+--- 751,757 ----
+ continue;
+ }
+
+! /* Pressing CTRL-Y selects the current match. When
+ * compl_enter_selects is set the Enter key does the same. */
+ if (c == Ctrl_Y || (compl_enter_selects
+ && (c == CAR || c == K_KENTER || c == NL)))
+***************
+*** 3046,3052 ****
+ ins_compl_delete();
+ ins_bytes(compl_leader + curwin->w_cursor.col - compl_col);
+ compl_used_match = FALSE;
+- compl_enter_selects = FALSE;
+
+ if (compl_started)
+ ins_compl_set_original_text(compl_leader);
+--- 3046,3051 ----
+***************
+*** 3076,3081 ****
+--- 3075,3081 ----
+ compl_restarting = FALSE;
+ }
+
++ #if 0 /* disabled, made CTRL-L, BS and typing char jump to original text. */
+ if (!compl_used_match)
+ {
+ /* Go to the original text, since none of the matches is inserted. */
+***************
+*** 3087,3092 ****
+--- 3087,3094 ----
+ compl_curr_match = compl_shown_match;
+ compl_shows_dir = compl_direction;
+ }
++ #endif
++ compl_enter_selects = !compl_used_match;
+
+ /* Show the popup menu with a different set of matches. */
+ ins_compl_show_pum();
+***************
+*** 3175,3184 ****
+ char_u *p;
+ int len = curwin->w_cursor.col - compl_col;
+ int c;
+
+ p = compl_shown_match->cp_str;
+ if ((int)STRLEN(p) <= len) /* the match is too short */
+! return;
+ p += len;
+ #ifdef FEAT_MBYTE
+ c = mb_ptr2char(p);
+--- 3177,3208 ----
+ char_u *p;
+ int len = curwin->w_cursor.col - compl_col;
+ int c;
++ compl_T *cp;
+
+ p = compl_shown_match->cp_str;
+ if ((int)STRLEN(p) <= len) /* the match is too short */
+! {
+! /* When still at the original match use the first entry that matches
+! * the leader. */
+! if (compl_shown_match->cp_flags & ORIGINAL_TEXT)
+! {
+! p = NULL;
+! for (cp = compl_shown_match->cp_next; cp != NULL
+! && cp != compl_first_match; cp = cp->cp_next)
+! {
+! if (ins_compl_equal(cp, compl_leader,
+! (int)STRLEN(compl_leader)))
+! {
+! p = cp->cp_str;
+! break;
+! }
+! }
+! if (p == NULL || (int)STRLEN(p) <= len)
+! return;
+! }
+! else
+! return;
+! }
+ p += len;
+ #ifdef FEAT_MBYTE
+ c = mb_ptr2char(p);
+***************
+*** 4100,4105 ****
+--- 4124,4144 ----
+ && compl_shown_match->cp_next != NULL
+ && compl_shown_match->cp_next != compl_first_match)
+ compl_shown_match = compl_shown_match->cp_next;
++
++ /* If we didn't find it searching forward, and compl_shows_dir is
++ * backward, find the last match. */
++ if (compl_shows_dir == BACKWARD
++ && !ins_compl_equal(compl_shown_match,
++ compl_leader, (int)STRLEN(compl_leader))
++ && (compl_shown_match->cp_next == NULL
++ || compl_shown_match->cp_next == compl_first_match))
++ {
++ while (!ins_compl_equal(compl_shown_match,
++ compl_leader, (int)STRLEN(compl_leader))
++ && compl_shown_match->cp_prev != NULL
++ && compl_shown_match->cp_prev != compl_first_match)
++ compl_shown_match = compl_shown_match->cp_prev;
++ }
+ }
+
+ if (allow_get_expansion && insert_match
+*** ../vim-7.0.012/src/version.c Thu May 11 19:30:09 2006
+--- src/version.c Fri May 12 19:03:32 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 13,
+ /**/
+
+--
+I'm writing a book. I've got the page numbers done.
+
+ /// 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.014
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.014?rev=666&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.014 (added)
+++ trunk/packages/vim/upstream/patches/7.0.014 Fri May 12 18:26:28 2006
@@ -1,0 +1,189 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.014
+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.014
+Problem: Compiling gui_xmebw.c fails on Dec Alpha Tru64. (Rolfe)
+Solution: Disable some code for Motif 1.2 and older.
+Files: src/gui_xmebw.c
+
+
+*** ../vim-7.0.013/src/gui_xmebw.c Wed May 10 15:22:49 2006
+--- src/gui_xmebw.c Thu May 11 19:09:32 2006
+***************
+*** 480,486 ****
+ || (eb->core.height <= 2 * eb->primitive.highlight_thickness))
+ return;
+
+! #ifndef LESSTIF_VERSION
+ {
+ XmDisplay dpy;
+
+--- 480,486 ----
+ || (eb->core.height <= 2 * eb->primitive.highlight_thickness))
+ return;
+
+! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+ {
+ XmDisplay dpy;
+
+***************
+*** 641,647 ****
+ GC tmp_gc = NULL;
+ Boolean replaceGC = False;
+ Boolean deadjusted = False;
+! #ifndef LESSTIF_VERSION
+ XmDisplay dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
+ Boolean etched_in = dpy->display.enable_etched_in_menu;
+ #else
+--- 641,647 ----
+ GC tmp_gc = NULL;
+ Boolean replaceGC = False;
+ Boolean deadjusted = False;
+! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+ XmDisplay dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
+ Boolean etched_in = dpy->display.enable_etched_in_menu;
+ #else
+***************
+*** 726,732 ****
+ if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up)
+ && _XmGetInDragMode((Widget) eb))
+ {
+! #ifndef LESSTIF_VERSION
+ XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
+ Boolean etched_in = dpy->display.enable_etched_in_menu;
+ #else
+--- 726,732 ----
+ if ((((ShellWidget) XtParent(XtParent(eb)))->shell.popped_up)
+ && _XmGetInDragMode((Widget) eb))
+ {
+! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+ XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
+ Boolean etched_in = dpy->display.enable_etched_in_menu;
+ #else
+***************
+*** 810,816 ****
+
+ if (Lab_IsMenupane(eb))
+ {
+! #ifndef LESSTIF_VERSION
+ XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
+ Boolean etched_in = dpy->display.enable_etched_in_menu;
+ #else
+--- 810,816 ----
+
+ if (Lab_IsMenupane(eb))
+ {
+! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+ XmDisplay dpy = (XmDisplay) XmGetXmDisplay(XtDisplay(wid));
+ Boolean etched_in = dpy->display.enable_etched_in_menu;
+ #else
+***************
+*** 1150,1156 ****
+ Redisplay(Widget w, XEvent *event, Region region)
+ {
+ XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) w;
+! #ifndef LESSTIF_VERSION
+ XmDisplay dpy;
+ XtEnum default_button_emphasis;
+ #endif
+--- 1150,1156 ----
+ Redisplay(Widget w, XEvent *event, Region region)
+ {
+ XmEnhancedButtonWidget eb = (XmEnhancedButtonWidget) w;
+! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+ XmDisplay dpy;
+ XtEnum default_button_emphasis;
+ #endif
+***************
+*** 1162,1168 ****
+ if (!XtIsRealized((Widget)eb))
+ return;
+
+! #ifndef LESSTIF_VERSION
+ dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
+ default_button_emphasis = dpy->display.default_button_emphasis;
+ #endif
+--- 1162,1168 ----
+ if (!XtIsRealized((Widget)eb))
+ return;
+
+! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+ dpy = (XmDisplay)XmGetXmDisplay(XtDisplay(eb));
+ default_button_emphasis = dpy->display.default_button_emphasis;
+ #endif
+***************
+*** 1241,1247 ****
+ {
+ int adjust = 0;
+
+! #ifndef LESSTIF_VERSION
+ /*
+ * NOTE: PushButton has two types of shadows: primitive-shadow and
+ * default-button-shadow. If pushbutton is in a menu only primitive
+--- 1241,1247 ----
+ {
+ int adjust = 0;
+
+! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+ /*
+ * NOTE: PushButton has two types of shadows: primitive-shadow and
+ * default-button-shadow. If pushbutton is in a menu only primitive
+***************
+*** 1289,1295 ****
+ adjust, adjust, rectwidth, rectheight, borderwidth);
+ }
+
+! #ifndef LESSTIF_VERSION
+ switch (default_button_emphasis)
+ {
+ case XmINTERNAL_HIGHLIGHT:
+--- 1289,1295 ----
+ adjust, adjust, rectwidth, rectheight, borderwidth);
+ }
+
+! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+ switch (default_button_emphasis)
+ {
+ case XmINTERNAL_HIGHLIGHT:
+***************
+*** 1365,1371 ****
+ default_button_shadow_thickness =
+ eb->pushbutton.default_button_shadow_thickness;
+
+! #ifndef LESSTIF_VERSION
+ /*
+ * Compute location of bounding box to contain the
+ * defaultButtonShadow.
+--- 1365,1371 ----
+ default_button_shadow_thickness =
+ eb->pushbutton.default_button_shadow_thickness;
+
+! #if !defined(LESSTIF_VERSION) && (XmVersion > 1002)
+ /*
+ * Compute location of bounding box to contain the
+ * defaultButtonShadow.
+*** ../vim-7.0.013/src/version.c Fri May 12 19:10:03 2006
+--- src/version.c Fri May 12 19:23:12 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 14,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+126. You brag to all of your friends about your date Saturday night...but
+ you don't tell them it was only in a chat room.
+
+ /// 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.015
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.015?rev=666&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.015 (added)
+++ trunk/packages/vim/upstream/patches/7.0.015 Fri May 12 18:26:28 2006
@@ -1,0 +1,204 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.015
+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.015
+Problem: Athena: compilation problems with modern compiler.
+Solution: Avoid type casts for lvalue. (Alexey Froloff)
+Files: src/gui_at_fs.c
+
+
+*** ../vim-7.0.014/src/gui_at_fs.c Wed May 10 15:22:49 2006
+--- src/gui_at_fs.c Fri May 12 11:26:24 2006
+***************
+*** 1861,1887 ****
+ XtPointer pnew;
+ {
+ SFDir *dir;
+! int nw;
+
+ dir = &(SFdirs[SFdirPtr + (int)(long)n]);
+
+ #ifdef FEAT_GUI_NEXTAW
+! if ((int)(long)pnew < 0)
+ {
+! if ((int)(long)pnew > -SFvScrollHeight)
+! (int)(long)pnew = -1;
+ else
+! (int)(long)pnew = -SFlistSize;
+ }
+! else if ((int)(long)pnew > 0)
+ {
+! if ((int)(long)pnew < SFvScrollHeight)
+! (int)(long)pnew = 1;
+ else
+! (int)(long)pnew = SFlistSize;
+ }
+ #endif
+! nw = dir->vOrigin + (int)(long)pnew;
+
+ if (nw > dir->nEntries - SFlistSize)
+ nw = dir->nEntries - SFlistSize;
+--- 1861,1887 ----
+ XtPointer pnew;
+ {
+ SFDir *dir;
+! int nw = (int)(long)pnew;
+
+ dir = &(SFdirs[SFdirPtr + (int)(long)n]);
+
+ #ifdef FEAT_GUI_NEXTAW
+! if (nw < 0)
+ {
+! if (nw > -SFvScrollHeight)
+! nw = -1;
+ else
+! nw = -SFlistSize;
+ }
+! else if (nw > 0)
+ {
+! if (nw < SFvScrollHeight)
+! nw = 1;
+ else
+! nw = SFlistSize;
+ }
+ #endif
+! nw += dir->vOrigin;
+
+ if (nw > dir->nEntries - SFlistSize)
+ nw = dir->nEntries - SFlistSize;
+***************
+*** 1941,1967 ****
+ XtPointer pnew;
+ {
+ SFDir *dir;
+! int nw;
+
+ dir = &(SFdirs[SFdirPtr + (int)(long)n]);
+
+ #ifdef FEAT_GUI_NEXTAW
+! if ((int)(long)pnew < 0)
+ {
+! if ((int)(long)pnew > -SFhScrollWidth)
+! (int)(long)pnew = -1;
+ else
+! (int)(long)pnew = -SFcharsPerEntry;
+ }
+! else if ((int)(long)pnew > 0)
+ {
+! if ((int)(long)pnew < SFhScrollWidth)
+! (int)(long)pnew = 1;
+ else
+! (int)(long)pnew = SFcharsPerEntry;
+ }
+ #endif
+! nw = dir->hOrigin + (int)(long)pnew;
+
+ if (nw > dir->nChars - SFcharsPerEntry)
+ nw = dir->nChars - SFcharsPerEntry;
+--- 1941,1967 ----
+ XtPointer pnew;
+ {
+ SFDir *dir;
+! int nw = (int)(long)pnew;
+
+ dir = &(SFdirs[SFdirPtr + (int)(long)n]);
+
+ #ifdef FEAT_GUI_NEXTAW
+! if (nw < 0)
+ {
+! if (nw > -SFhScrollWidth)
+! nw = -1;
+ else
+! nw = -SFcharsPerEntry;
+ }
+! else if (nw > 0)
+ {
+! if (nw < SFhScrollWidth)
+! nw = 1;
+ else
+! nw = SFcharsPerEntry;
+ }
+ #endif
+! nw += dir->hOrigin;
+
+ if (nw > dir->nChars - SFcharsPerEntry)
+ nw = dir->nChars - SFcharsPerEntry;
+***************
+*** 2038,2063 ****
+ XtPointer client_data;
+ XtPointer pnew;
+ {
+! int nw;
+ float f;
+
+ #ifdef FEAT_GUI_NEXTAW
+! if ((int)(long)pnew < 0)
+ {
+! if ((int)(long)pnew > -SFpathScrollWidth)
+! (int)(long)pnew = -1;
+ else
+! (int)(long)pnew = -3;
+ }
+! else if ((int)(long)pnew > 0)
+ {
+! if ((int)(long)pnew < SFpathScrollWidth)
+! (int)(long)pnew = 1;
+ else
+! (int)(long)pnew = 3;
+ }
+ #endif
+! nw = SFdirPtr + (int)(long)pnew;
+
+ if (nw > SFdirEnd - 3)
+ nw = SFdirEnd - 3;
+--- 2038,2063 ----
+ XtPointer client_data;
+ XtPointer pnew;
+ {
+! int nw = (int)(long)pnew;
+ float f;
+
+ #ifdef FEAT_GUI_NEXTAW
+! if (nw < 0)
+ {
+! if (nw > -SFpathScrollWidth)
+! nw = -1;
+ else
+! nw = -3;
+ }
+! else if (nw > 0)
+ {
+! if (nw < SFpathScrollWidth)
+! nw = 1;
+ else
+! nw = 3;
+ }
+ #endif
+! nw += SFdirPtr;
+
+ if (nw > SFdirEnd - 3)
+ nw = SFdirEnd - 3;
+*** ../vim-7.0.014/src/version.c Fri May 12 19:24:33 2006
+--- src/version.c Fri May 12 19:25:57 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+ { /* Add new patch number below this line */
++ /**/
++ 15,
+ /**/
+
+--
+hundred-and-one symptoms of being an internet addict:
+127. You bring your laptop and cellular phone to church.
+
+ /// 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