diff --git a/7.0.013 b/7.0.013 new file mode 100644 index 0000000..423ea31 --- /dev/null +++ b/7.0.013 @@ -0,0 +1,154 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.013 +Fcc: outbox +From: Bram Moolenaar +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@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 /// diff --git a/7.0.014 b/7.0.014 new file mode 100644 index 0000000..b6d927d --- /dev/null +++ b/7.0.014 @@ -0,0 +1,189 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.014 +Fcc: outbox +From: Bram Moolenaar +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@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 /// diff --git a/7.0.015 b/7.0.015 new file mode 100644 index 0000000..acc5928 --- /dev/null +++ b/7.0.015 @@ -0,0 +1,204 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.015 +Fcc: outbox +From: Bram Moolenaar +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@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 /// diff --git a/7.0.016 b/7.0.016 new file mode 100644 index 0000000..00f519c --- /dev/null +++ b/7.0.016 @@ -0,0 +1,67 @@ +To: vim-dev@vim.org +Subject: Patch 7.0.016 +Fcc: outbox +From: Bram Moolenaar +Mime-Version: 1.0 +Content-Type: text/plain; charset=ISO-8859-1 +Content-Transfer-Encoding: 8bit +------------ + +Patch 7.0.016 +Problem: Printing doesn't work for "dec-mcs" encoding. +Solution: Add "dec-mcs", "mac-roman" and "hp-roman8" to the list of + recognized 8-bit encodings. (Mike Williams) +Files: src/mbyte.c + + +*** ../vim-7.0.015/src/mbyte.c Wed May 10 15:22:50 2006 +--- src/mbyte.c Sat May 13 09:12:43 2006 +*************** +*** 311,317 **** + + #define IDX_MACROMAN 57 + {"macroman", ENC_8BIT + ENC_MACROMAN, 0}, /* Mac OS */ +! #define IDX_COUNT 58 + }; + + /* +--- 311,321 ---- + + #define IDX_MACROMAN 57 + {"macroman", ENC_8BIT + ENC_MACROMAN, 0}, /* Mac OS */ +! #define IDX_DECMCS 58 +! {"dec-mcs", ENC_8BIT, 0}, /* DEC MCS */ +! #define IDX_HPROMAN8 59 +! {"hp-roman8", ENC_8BIT, 0}, /* HP Roman8 */ +! #define IDX_COUNT 60 + }; + + /* +*************** +*** 386,391 **** +--- 390,396 ---- + {"950", IDX_BIG5}, + #endif + {"mac", IDX_MACROMAN}, ++ {"mac-roman", IDX_MACROMAN}, + {NULL, 0} + }; + +*** ../vim-7.0.015/src/version.c Fri May 12 19:27:55 2006 +--- src/version.c Sat May 13 09:11:27 2006 +*************** +*** 668,669 **** +--- 668,671 ---- + { /* Add new patch number below this line */ ++ /**/ ++ 16, + /**/ + +-- +hundred-and-one symptoms of being an internet addict: +135. You cut classes or miss work so you can stay home and browse the web. + + /// Bram Moolenaar -- Bram@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 /// diff --git a/README.patches b/README.patches index ed5de51..fb10836 100644 --- a/README.patches +++ b/README.patches @@ -37,3 +37,7 @@ Individual patches for Vim 7.0: 3705 7.0.010 spellfile plugin required typing login name and password 1989 7.0.011 can't compile with eval feature without folding feature 2532 7.0.012 matchparen plugin changed cursor column in Insert mode + 4614 7.0.013 Insert mode completion: CTRL-L jumped back to original text + 5712 7.0.014 Motif: doesn't compile with Motif 1.2 and earlier + 4485 7.0.015 Athena: type casts for lvalues + 1810 7.0.016 recognize encodings "mac-roman", "dec-mcs" and "hp-roman8" diff --git a/vim.spec b/vim.spec index d270297..76ce50c 100644 --- a/vim.spec +++ b/vim.spec @@ -24,7 +24,7 @@ #used for pre-releases: %define beta %{nil} %define vimdir vim70%{?beta} -%define patchlevel 012 +%define patchlevel 016 Summary: The VIM editor. Name: vim @@ -66,6 +66,10 @@ Patch009: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.009 Patch010: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.010 Patch011: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.011 Patch012: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.012 +Patch013: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.013 +Patch014: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.014 +Patch015: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.015 +Patch016: ftp://ftp.vim.org/pub/vim/patches/7.0/7.0.016 Patch3000: vim-7.0-syntax.patch @@ -208,6 +212,10 @@ perl -pi -e "s,bin/nawk,bin/awk,g" runtime/tools/mve.awk %patch010 -p0 %patch011 -p0 %patch012 -p0 +%patch013 -p0 +%patch014 -p0 +%patch015 -p0 +%patch016 -p0 %patch3000 -p1 %patch3001 -p1 @@ -544,6 +552,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/*/apps/* %changelog +* Sat May 13 2006 Karsten Hopp 7.0.016-1 +- patchlevel 016 + * Fri May 12 2006 Karsten Hopp 7.0.012-1 - patchlevel 012