editors/macvim/files/patch-option.c

   1 --- option.c.orig
   2 +++ option.c
   3 @@ -524,11 +524,6 @@
   4                             (char_u *)NULL, PV_NONE,
   5  #endif
   6                             {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
   7 -#ifdef FEAT_GDB
   8 -    {"asm",        NULL,   P_NUM|P_VI_DEF,
   9 -                           (char_u *)&p_asm, PV_NONE,
  10 -                           {(char_u *)10L, (char_u *)0L}},
  11 -#endif
  12      {"altkeymap",   "akm",  P_BOOL|P_VI_DEF,
  13  #ifdef FEAT_FKMAP
  14                             (char_u *)&p_altkeymap, PV_NONE,
  15 @@ -545,6 +540,11 @@
  16                             {(char_u *)0L, (char_u *)0L}
  17  #endif
  18                             SCRIPTID_INIT},
  19 +#ifdef FEAT_GDB
  20 +    {"asm",        NULL,   P_NUM|P_VI_DEF,
  21 +                           (char_u *)&p_asm, PV_NONE,
  22 +                           {(char_u *)10L, (char_u *)0L}},
  23 +#endif
  24  #ifdef FEAT_AUTOCHDIR
  25      {"autochdir",  "acd",   P_BOOL|P_VI_DEF,
  26                             (char_u *)&p_acd, PV_NONE,
  27 @@ -1158,14 +1158,6 @@
  28  # endif
  29                             SCRIPTID_INIT},
  30  #endif
  31 -#ifdef FEAT_GDB
  32 -    {"gdbvariables", "gdbvar",P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  33 -                           (char_u *)&p_gvar, PV_NONE,
  34 -                           {(char_u *)"gdb-variables", (char_u *)0L} },
  35 -    {"gdbprg",     "gdp",  P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  36 -                           (char_u *)&p_gdp, PV_NONE,
  37 -                           {(char_u *)"gdb", (char_u *)0L} },
  38 -#endif
  39      {"formatexpr", "fex",   P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
  40  #ifdef FEAT_EVAL
  41                             (char_u *)&p_fex, PV_FEX,
  42 @@ -1211,6 +1203,14 @@
  43                             {(char_u *)NULL, (char_u *)0L}
  44  #endif
  45                             SCRIPTID_INIT},
  46 +#ifdef FEAT_GDB
  47 +    {"gdbvariables", "gdbvar",P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  48 +                           (char_u *)&p_gvar, PV_NONE,
  49 +                           {(char_u *)"gdb-variables", (char_u *)0L} },
  50 +    {"gdbprg",     "gdp",  P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  51 +                           (char_u *)&p_gdp, PV_NONE,
  52 +                           {(char_u *)"gdb", (char_u *)0L} },
  53 +#endif
  54      {"gdefault",    "gd",   P_BOOL|P_VI_DEF|P_VIM,
  55                             (char_u *)&p_gd, PV_NONE,
  56                             {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},