Changeset fefaf43


Ignore:
Timestamp:
May 25, 2006, 12:25:46 PM (15 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
99c7711
Parents:
625a3b8
Message:

Added: vim-7.0-fixes-3.patch

File:
1 moved

Legend:

Unmodified
Added
Removed
  • patches/vim-7.0-fixes-3.patch

    r625a3b8 rfefaf43  
    1 Submitted By: Jim Gifford (patches at jg555 dot com)
    2 Date: 2006-05-12
     1Submitted By: Jeremy Huntwork (jhuntwork at linuxfromscratch dot org)
     2Date: 2006-05-25
    33Initial Package Version: 7.0
    44Origin: Upstream
    55Upstream Status: Applied
    6 Description: Contains Patch 001-004 and 006-015 from Upstream
     6Description: Contains Patch 001-004 and 006-017 from Upstream
    77        005 is for the extras and Windows 32 only
    88
    9 diff -Naur vim70.orig/runtime/autoload/ccomplete.vim vim70/runtime/autoload/ccomplete.vim
    10 --- vim70.orig/runtime/autoload/ccomplete.vim   2006-05-03 07:35:56.000000000 -0700
    11 +++ vim70/runtime/autoload/ccomplete.vim        2006-05-12 13:14:48.000000000 -0700
     9diff -Naur vim70-orig/runtime/autoload/ccomplete.vim vim70/runtime/autoload/ccomplete.vim
     10--- vim70-orig/runtime/autoload/ccomplete.vim   2006-05-03 10:35:56.000000000 -0400
     11+++ vim70/runtime/autoload/ccomplete.vim        2006-05-25 09:13:10.000000000 -0400
    1212@@ -1,7 +1,7 @@
    1313 " Vim completion script
     
    2828     return []
    2929   endif
    30 diff -Naur vim70.orig/runtime/autoload/spellfile.vim vim70/runtime/autoload/spellfile.vim
    31 --- vim70.orig/runtime/autoload/spellfile.vim   2006-02-01 04:12:24.000000000 -0800
    32 +++ vim70/runtime/autoload/spellfile.vim        2006-05-12 13:14:48.000000000 -0700
     30diff -Naur vim70-orig/runtime/autoload/spellfile.vim vim70/runtime/autoload/spellfile.vim
     31--- vim70-orig/runtime/autoload/spellfile.vim   2006-02-01 07:12:24.000000000 -0500
     32+++ vim70/runtime/autoload/spellfile.vim        2006-05-25 09:13:12.000000000 -0400
    3333@@ -1,9 +1,9 @@
    3434 " Vim script to download a missing spell file
     
    7979+  exe 'Nread "' . machine . ' anonymous vim7user ' . dir . '/' . a:fname . '"'
    8080+endfunc
    81 diff -Naur vim70.orig/runtime/plugin/matchparen.vim vim70/runtime/plugin/matchparen.vim
    82 --- vim70.orig/runtime/plugin/matchparen.vim    2006-04-27 06:31:26.000000000 -0700
    83 +++ vim70/runtime/plugin/matchparen.vim 2006-05-12 13:14:48.000000000 -0700
     81diff -Naur vim70-orig/runtime/plugin/matchparen.vim vim70/runtime/plugin/matchparen.vim
     82--- vim70-orig/runtime/plugin/matchparen.vim    2006-04-27 09:31:26.000000000 -0400
     83+++ vim70/runtime/plugin/matchparen.vim 2006-05-25 09:13:12.000000000 -0400
    8484@@ -1,6 +1,6 @@
    8585 " Vim plugin for showing matching parens
     
    108108 
    109109   " If a match is found setup match highlighting.
    110 diff -Naur vim70.orig/src/edit.c vim70/src/edit.c
    111 --- vim70.orig/src/edit.c       2006-05-07 04:48:51.000000000 -0700
    112 +++ vim70/src/edit.c    2006-05-12 13:15:43.000000000 -0700
     110diff -Naur vim70-orig/src/edit.c vim70/src/edit.c
     111--- vim70-orig/src/edit.c       2006-05-07 07:48:51.000000000 -0400
     112+++ vim70/src/edit.c    2006-05-25 09:13:12.000000000 -0400
    113113@@ -751,7 +751,7 @@
    114114                    continue;
     
    201201 
    202202     if (allow_get_expansion && insert_match
    203 diff -Naur vim70.orig/src/eval.c vim70/src/eval.c
    204 --- vim70.orig/src/eval.c       2006-05-05 10:15:26.000000000 -0700
    205 +++ vim70/src/eval.c    2006-05-12 13:14:48.000000000 -0700
     203diff -Naur vim70-orig/src/eval.c vim70/src/eval.c
     204--- vim70-orig/src/eval.c       2006-05-05 13:15:26.000000000 -0400
     205+++ vim70/src/eval.c    2006-05-25 09:13:11.000000000 -0400
    206206@@ -11372,7 +11372,7 @@
    207207            if (argvars[2].v_type != VAR_UNKNOWN)
     
    223223            /* It's "s:" or "<SID>" */
    224224            if (current_SID <= 0)
    225 diff -Naur vim70.orig/src/ex_docmd.c vim70/src/ex_docmd.c
    226 --- vim70.orig/src/ex_docmd.c   2006-05-05 09:33:19.000000000 -0700
    227 +++ vim70/src/ex_docmd.c        2006-05-12 13:14:48.000000000 -0700
     225diff -Naur vim70-orig/src/ex_docmd.c vim70/src/ex_docmd.c
     226--- vim70-orig/src/ex_docmd.c   2006-05-05 12:33:19.000000000 -0400
     227+++ vim70/src/ex_docmd.c        2006-05-25 09:13:10.000000000 -0400
    228228@@ -833,7 +833,7 @@
    229229      * If requested, store and reset the global values controlling the
     
    235235 
    236236     initial_trylevel = trylevel;
    237 diff -Naur vim70.orig/src/gui_at_fs.c vim70/src/gui_at_fs.c
    238 --- vim70.orig/src/gui_at_fs.c  2005-07-09 04:30:17.000000000 -0700
    239 +++ vim70/src/gui_at_fs.c       2006-05-12 13:18:22.000000000 -0700
     237diff -Naur vim70-orig/src/gui_at_fs.c vim70/src/gui_at_fs.c
     238--- vim70-orig/src/gui_at_fs.c  2005-07-09 07:30:17.000000000 -0400
     239+++ vim70/src/gui_at_fs.c       2006-05-25 09:13:13.000000000 -0400
    240240@@ -1861,27 +1861,27 @@
    241241     XtPointer  pnew;
     
    351351     if (nw > SFdirEnd - 3)
    352352        nw = SFdirEnd - 3;
    353 diff -Naur vim70.orig/src/gui.c vim70/src/gui.c
    354 --- vim70.orig/src/gui.c        2006-05-03 04:00:59.000000000 -0700
    355 +++ vim70/src/gui.c     2006-05-12 13:14:48.000000000 -0700
     353diff -Naur vim70-orig/src/gui.c vim70/src/gui.c
     354--- vim70-orig/src/gui.c        2006-05-03 07:00:59.000000000 -0400
     355+++ vim70/src/gui.c     2006-05-25 09:13:10.000000000 -0400
    356356@@ -4603,11 +4603,11 @@
    357357     /* Don't move the mouse when it's left or right of the Vim window */
     
    369369     if (wp != curwin && wp != NULL)    /* If in other than current window */
    370370     {
    371 diff -Naur vim70.orig/src/gui_xmebw.c vim70/src/gui_xmebw.c
    372 --- vim70.orig/src/gui_xmebw.c  2006-04-30 08:32:32.000000000 -0700
    373 +++ vim70/src/gui_xmebw.c       2006-05-12 13:17:21.000000000 -0700
     371diff -Naur vim70-orig/src/gui_xmebw.c vim70/src/gui_xmebw.c
     372--- vim70-orig/src/gui_xmebw.c  2006-04-30 11:32:32.000000000 -0400
     373+++ vim70/src/gui_xmebw.c       2006-05-25 09:13:13.000000000 -0400
     374@@ -47,13 +47,13 @@
     375 #include "gui_xmebwp.h"
     376 
     377 /* Provide some missing wrappers, which are missed from the LessTif
     378- * implementation.
     379+ * implementation.  Also missing in Motif 1.2 and earlier.
     380  *
     381  * We neither use XmeGetPixmapData or _XmGetPixmapData, since with LessTif the
     382  * pixmap will not appear in it's caches properly. We cache the interresting
     383  * values in XmEnhancedButtonPart instead ourself.
     384  */
     385-#ifdef LESSTIF_VERSION
     386+#if defined(LESSTIF_VERSION) || (XmVersion <= 1002)
     387 # ifndef Lab_IsMenupane
     388 #  define Lab_IsMenupane(w) (Lab_MenuType(w) == (int)XmMENU_POPUP || \
     389                    Lab_MenuType(w) == (int)XmMENU_PULLDOWN)
    374390@@ -480,7 +480,7 @@
    375391            || (eb->core.height <= 2 * eb->primitive.highlight_thickness))
     
    453469                 * Compute location of bounding box to contain the
    454470                 * defaultButtonShadow.
    455 diff -Naur vim70.orig/src/Makefile vim70/src/Makefile
    456 --- vim70.orig/src/Makefile     2006-05-07 06:25:27.000000000 -0700
    457 +++ vim70/src/Makefile  2006-05-12 13:14:48.000000000 -0700
     471diff -Naur vim70-orig/src/Makefile vim70/src/Makefile
     472--- vim70-orig/src/Makefile     2006-05-07 09:25:27.000000000 -0400
     473+++ vim70/src/Makefile  2006-05-25 09:13:11.000000000 -0400
    458474@@ -2177,6 +2177,7 @@
    459475        cd $(SHADOWDIR)/xxd; ln -s ../../xxd/*.[ch] ../../xxd/Make* .
     
    464480        fi
    465481        mkdir $(SHADOWDIR)/testdir
    466 diff -Naur vim70.orig/src/message.c vim70/src/message.c
    467 --- vim70.orig/src/message.c    2006-05-06 13:07:37.000000000 -0700
    468 +++ vim70/src/message.c 2006-05-12 13:14:48.000000000 -0700
     482diff -Naur vim70-orig/src/mbyte.c vim70/src/mbyte.c
     483--- vim70-orig/src/mbyte.c      2006-04-30 07:51:01.000000000 -0400
     484+++ vim70/src/mbyte.c   2006-05-25 09:13:13.000000000 -0400
     485@@ -311,7 +311,11 @@
     486 
     487 #define IDX_MACROMAN   57
     488     {"macroman",       ENC_8BIT + ENC_MACROMAN, 0},    /* Mac OS */
     489-#define IDX_COUNT      58
     490+#define IDX_DECMCS     58
     491+    {"dec-mcs",                ENC_8BIT,               0},     /* DEC MCS */
     492+#define IDX_HPROMAN8   59
     493+    {"hp-roman8",      ENC_8BIT,               0},     /* HP Roman8 */
     494+#define IDX_COUNT      60
     495 };
     496 
     497 /*
     498@@ -386,6 +390,7 @@
     499     {"950",            IDX_BIG5},
     500 #endif
     501     {"mac",            IDX_MACROMAN},
     502+    {"mac-roman",      IDX_MACROMAN},
     503     {NULL,             0}
     504 };
     505 
     506diff -Naur vim70-orig/src/message.c vim70/src/message.c
     507--- vim70-orig/src/message.c    2006-05-06 16:07:37.000000000 -0400
     508+++ vim70/src/message.c 2006-05-25 09:13:11.000000000 -0400
    469509@@ -4175,15 +4175,16 @@
    470510                        str_arg_l = 0;
     
    490530                    }
    491531                    break;
    492 diff -Naur vim70.orig/src/option.c vim70/src/option.c
    493 --- vim70.orig/src/option.c     2006-05-03 10:32:28.000000000 -0700
    494 +++ vim70/src/option.c  2006-05-12 13:14:48.000000000 -0700
     532diff -Naur vim70-orig/src/option.c vim70/src/option.c
     533--- vim70-orig/src/option.c     2006-05-03 13:32:28.000000000 -0400
     534+++ vim70/src/option.c  2006-05-25 09:13:12.000000000 -0400
    495535@@ -2294,7 +2294,7 @@
    496536                            {(char_u *)0L, (char_u *)0L}
     
    518558            case PV_INDE:       return &curbuf->b_p_inde_flags;
    519559 # endif
    520 diff -Naur vim70.orig/src/spell.c vim70/src/spell.c
    521 --- vim70.orig/src/spell.c      2006-05-05 00:49:58.000000000 -0700
    522 +++ vim70/src/spell.c   2006-05-12 13:14:48.000000000 -0700
     560diff -Naur vim70-orig/src/spell.c vim70/src/spell.c
     561--- vim70-orig/src/spell.c      2006-05-05 03:49:58.000000000 -0400
     562+++ vim70/src/spell.c   2006-05-25 09:13:11.000000000 -0400
    523563@@ -2108,7 +2108,8 @@
    524564         * possible. */
     
    531571        p = buf + skip;
    532572        endp = buf + len;
    533 diff -Naur vim70.orig/src/version.c vim70/src/version.c
    534 --- vim70.orig/src/version.c    2006-05-03 00:50:42.000000000 -0700
    535 +++ vim70/src/version.c 2006-05-12 13:18:22.000000000 -0700
    536 @@ -667,6 +667,34 @@
     573diff -Naur vim70-orig/src/version.c vim70/src/version.c
     574--- vim70-orig/src/version.c    2006-05-03 03:50:42.000000000 -0400
     575+++ vim70/src/version.c 2006-05-25 09:13:13.000000000 -0400
     576@@ -667,6 +667,38 @@
    537577 static int included_patches[] =
    538578 {   /* Add new patch number below this line */
    539579 /**/
     580+    17,
     581+/**/
     582+    16,
     583+/**/
    540584+    15,
    541585+/**/
Note: See TracChangeset for help on using the changeset viewer.