- up to 8.2.0110

[packages/vim.git] / vim-autopaste.patch

diff --git a/vim-autopaste.patch b/vim-autopaste.patch
index ba00b381546ea8bd539b50dd6516afd082d3c402..ac5148c7b03cb3f1bfdf6a5f8c26c505db949439 100644 (file)
--- a/vim-autopaste.patch
+++ b/vim-autopaste.patch
@@ -39,28 +39,25 @@ diff -cr vim70.orig/src/getchar.c vim70/src/getchar.c
       /*
        * If a character was put back with vungetc, it was already processed.
        * Return it directly.
---- vim72/src/option.c~        2009-05-18 22:23:40.000000000 +0300
-+++ vim72/src/option.c 2009-05-18 22:30:25.277259155 +0300
-@@ -535,6 +535,9 @@
+--- vim72/src/optiondefs.h~    2009-05-18 22:23:40.000000000 +0300
++++ vim72/src/optiondefs.h     2009-05-18 22:30:25.277259155 +0300
+@@ -377,6 +377,9 @@
      {"autoindent",  "ai",   P_BOOL|P_VI_DEF,
                            (char_u *)&p_ai, PV_AI,
-                           {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+                           {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
 +    {"autopaste",   "apa",  P_BOOL|P_VI_DEF,
 +                            (char_u *)&p_apa, PV_NONE,
-+                            {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
++                            {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
      {"autoprint",   "ap",   P_BOOL|P_VI_DEF,
                            (char_u *)NULL, PV_NONE,
-                           {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
-diff -cr vim70.orig/src/option.h vim70/src/option.h
-*** vim70.orig/src/option.h    2006-09-12 21:47:30.000000000 -0400
---- vim70/src/option.h 2006-09-12 21:54:23.000000000 -0400
-***************
-*** 312,317 ****
---- 312,318 ----
-  #if defined(FEAT_GUI) && defined(MACOS_X)
-  EXTERN int   *p_antialias;   /* 'antialias' */
-  #endif
-+ EXTERN int      p_apa;          /* 'autopaste' */
-  EXTERN int   p_ar;           /* 'autoread' */
-  EXTERN int   p_aw;           /* 'autowrite' */
-  EXTERN int   p_awa;          /* 'autowriteall' */
+                           {(char_u *)FALSE, (char_u *)0L} SCTX_INIT},
+--- vim72/src/option.h~        2009-05-18 22:23:40.000000000 +0300
++++ vim72/src/option.h 2009-05-18 22:30:25.277259155 +0300
+@@ -312,6 +312,7 @@
+ #if defined(FEAT_GUI) && defined(MACOS_X)
+ EXTERN int    *p_antialias;   // 'antialias'
+ #endif
++EXTERN int      p_apa;          /* 'autopaste' */
+ EXTERN int    p_ar;           // 'autoread'
+ EXTERN int    p_aw;           // 'autowrite'
+ EXTERN int    p_awa;          // 'autowriteall'