MacVim 20090620

[splhack/MacPorts.git] / editors / macvim / files / patch-option.c

diff --git a/editors/macvim/files/patch-option.c b/editors/macvim/files/patch-option.c
index 07f6eee..2d9cd44 100644 (file)
--- a/editors/macvim/files/patch-option.c
+++ b/editors/macvim/files/patch-option.c
@@ -1,9 +1,33 @@
 --- option.c.orig
 +++ option.c
-@@ -1169,14 +1169,6 @@
-                           (char_u *)&p_fp, PV_NONE,
-                           {(char_u *)"", (char_u *)0L}},
-     {"fsync",       "fs",   P_BOOL|P_SECURE|P_VI_DEF,
+@@ -524,11 +524,6 @@
+                           (char_u *)NULL, PV_NONE,
+ #endif
+                           {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
+-#ifdef FEAT_GDB
+-    {"asm",       NULL,   P_NUM|P_VI_DEF,
+-                          (char_u *)&p_asm, PV_NONE,
+-                          {(char_u *)10L, (char_u *)0L}},
+-#endif
+     {"altkeymap",   "akm",  P_BOOL|P_VI_DEF,
+ #ifdef FEAT_FKMAP
+                           (char_u *)&p_altkeymap, PV_NONE,
+@@ -545,6 +540,11 @@
+                           {(char_u *)0L, (char_u *)0L}
+ #endif
+                           SCRIPTID_INIT},
++#ifdef FEAT_GDB
++    {"asm",       NULL,   P_NUM|P_VI_DEF,
++                          (char_u *)&p_asm, PV_NONE,
++                          {(char_u *)10L, (char_u *)0L}},
++#endif
+ #ifdef FEAT_AUTOCHDIR
+     {"autochdir",  "acd",   P_BOOL|P_VI_DEF,
+                           (char_u *)&p_acd, PV_NONE,
+@@ -1158,14 +1158,6 @@
+ # endif
+                           SCRIPTID_INIT},
+ #endif
 -#ifdef FEAT_GDB
 -    {"gdbvariables", "gdbvar",P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
 -                          (char_u *)&p_gvar, PV_NONE,
@@ -12,13 +36,13 @@
 -                          (char_u *)&p_gdp, PV_NONE,
 -                          {(char_u *)"gdb", (char_u *)0L} },
 -#endif
- #ifdef HAVE_FSYNC
-                           (char_u *)&p_fs, PV_NONE,
-                           {(char_u *)TRUE, (char_u *)0L}
-@@ -1200,6 +1192,14 @@
-                           (char_u *)NULL, PV_NONE,
-                           {(char_u *)NULL, (char_u *)0L}},
+     {"formatexpr", "fex",   P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
+ #ifdef FEAT_EVAL
+                           (char_u *)&p_fex, PV_FEX,
+@@ -1211,6 +1203,14 @@
+                           {(char_u *)NULL, (char_u *)0L}
  #endif
+                           SCRIPTID_INIT},
 +#ifdef FEAT_GDB
 +    {"gdbvariables", "gdbvar",P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
 +                          (char_u *)&p_gvar, PV_NONE,
@@ -29,4 +53,4 @@
 +#endif
      {"gdefault",    "gd",   P_BOOL|P_VI_DEF|P_VIM,
                            (char_u *)&p_gd, PV_NONE,
-                           {(char_u *)FALSE, (char_u *)0L}},
+                           {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},