home *** CD-ROM | disk | FTP | other *** search
/ vim.ftp.fu-berlin.de / 2015-02-03.vim.ftp.fu-berlin.de.tar / vim.ftp.fu-berlin.de / patches / 7.2 / 7.2.180 < prev    next >
Encoding:
Internet Message Format  |  2009-05-16  |  194.0 KB
  1. To: vim-dev@vim.org
  2. Subject: Patch 7.2.180
  3. Fcc: outbox
  4. From: Bram Moolenaar <Bram@moolenaar.net>
  5. Mime-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. ------------
  9.  
  10. Patch 7.2.180
  11. Problem:    Some more compiler warnings when using gcc -Wextra.
  12. Solution:   Add UNUSED and type casts.
  13. Files:        src/buffer.c, src/ex_cmds.c, src/macros.h, src/main.c,
  14.         src/menu.c, src/message.c, src/misc1.c, src/mbyte.c,
  15.         src/normal.c, src/option.c, src/os_unix.c, src/quickfix.c,
  16.         src/screen.c, src/search.c, src/spell.c, src/syntax.c, src/tag.c,
  17.         src/term.c, src/ui.c
  18.  
  19.  
  20. *** ../vim-7.2.179/src/buffer.c    2009-05-14 22:19:19.000000000 +0200
  21. --- src/buffer.c    2009-05-16 22:21:41.000000000 +0200
  22. ***************
  23. *** 2025,2037 ****
  24.    * Return fnum of the found buffer.
  25.    * Return < 0 for error.
  26.    */
  27. - /*ARGSUSED*/
  28.       int
  29.   buflist_findpat(pattern, pattern_end, unlisted, diffmode)
  30.       char_u    *pattern;
  31.       char_u    *pattern_end;    /* pointer to first char after pattern */
  32.       int        unlisted;    /* find unlisted buffers */
  33. !     int        diffmode;    /* find diff-mode buffers only */
  34.   {
  35.       buf_T    *buf;
  36.       regprog_T    *prog;
  37. --- 2025,2036 ----
  38.    * Return fnum of the found buffer.
  39.    * Return < 0 for error.
  40.    */
  41.       int
  42.   buflist_findpat(pattern, pattern_end, unlisted, diffmode)
  43.       char_u    *pattern;
  44.       char_u    *pattern_end;    /* pointer to first char after pattern */
  45.       int        unlisted;    /* find unlisted buffers */
  46. !     int        diffmode UNUSED; /* find diff-mode buffers only */
  47.   {
  48.       buf_T    *buf;
  49.       regprog_T    *prog;
  50. ***************
  51. *** 2539,2545 ****
  52.   /*
  53.    * List all know file names (for :files and :buffers command).
  54.    */
  55. - /*ARGSUSED*/
  56.       void
  57.   buflist_list(eap)
  58.       exarg_T    *eap;
  59. --- 2538,2543 ----
  60. ***************
  61. *** 3346,3359 ****
  62.    * If maxwidth is not zero, the string will be filled at any middle marker
  63.    * or truncated if too long, fillchar is used for all whitespace.
  64.    */
  65. - /*ARGSUSED*/
  66.       int
  67.   build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, tabtab)
  68.       win_T    *wp;
  69.       char_u    *out;        /* buffer to write into != NameBuff */
  70.       size_t    outlen;        /* length of out[] */
  71.       char_u    *fmt;
  72. !     int        use_sandbox;    /* "fmt" was set insecurely, use sandbox */
  73.       int        fillchar;
  74.       int        maxwidth;
  75.       struct stl_hlrec *hltab;    /* return: HL attributes (can be NULL) */
  76. --- 3344,3356 ----
  77.    * If maxwidth is not zero, the string will be filled at any middle marker
  78.    * or truncated if too long, fillchar is used for all whitespace.
  79.    */
  80.       int
  81.   build_stl_str_hl(wp, out, outlen, fmt, use_sandbox, fillchar, maxwidth, hltab, tabtab)
  82.       win_T    *wp;
  83.       char_u    *out;        /* buffer to write into != NameBuff */
  84.       size_t    outlen;        /* length of out[] */
  85.       char_u    *fmt;
  86. !     int        use_sandbox UNUSED; /* "fmt" was set insecurely, use sandbox */
  87.       int        fillchar;
  88.       int        maxwidth;
  89.       struct stl_hlrec *hltab;    /* return: HL attributes (can be NULL) */
  90. *** ../vim-7.2.179/src/ex_cmds.c    2009-05-16 16:36:25.000000000 +0200
  91. --- src/ex_cmds.c    2009-05-16 22:22:46.000000000 +0200
  92. ***************
  93. *** 2255,2266 ****
  94.    *
  95.    * Return the string in allocated memory (NULL when out of memory).
  96.    */
  97. - /*ARGSUSED*/
  98.       char_u *
  99.   viminfo_readstring(virp, off, convert)
  100.       vir_T    *virp;
  101.       int        off;            /* offset for virp->vir_line */
  102. !     int        convert;        /* convert the string */
  103.   {
  104.       char_u    *retval;
  105.       char_u    *s, *d;
  106. --- 2255,2265 ----
  107.    *
  108.    * Return the string in allocated memory (NULL when out of memory).
  109.    */
  110.       char_u *
  111.   viminfo_readstring(virp, off, convert)
  112.       vir_T    *virp;
  113.       int        off;            /* offset for virp->vir_line */
  114. !     int        convert UNUSED;        /* convert the string */
  115.   {
  116.       char_u    *retval;
  117.       char_u    *s, *d;
  118. ***************
  119. *** 2736,2742 ****
  120.    * May set eap->forceit if a dialog says it's OK to overwrite.
  121.    * Return OK if it's OK, FAIL if it is not.
  122.    */
  123. - /*ARGSUSED*/
  124.       static int
  125.   check_overwrite(eap, buf, fname, ffname, other)
  126.       exarg_T    *eap;
  127. --- 2735,2740 ----
  128. *** ../vim-7.2.179/src/macros.h    2009-02-21 20:27:00.000000000 +0100
  129. --- src/macros.h    2009-05-16 21:52:56.000000000 +0200
  130. ***************
  131. *** 284,290 ****
  132.   # define mb_cptr2len(p)        (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
  133.   
  134.   # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++
  135. ! # define MB_CHARLEN(p)        (has_mbyte ? mb_charlen(p) : STRLEN(p))
  136.   # define PTR2CHAR(p)        (has_mbyte ? mb_ptr2char(p) : (int)*(p))
  137.   #else
  138.   # define mb_ptr_adv(p)        ++p
  139. --- 284,290 ----
  140.   # define mb_cptr2len(p)        (enc_utf8 ? utf_ptr2len(p) : (*mb_ptr2len)(p))
  141.   
  142.   # define MB_COPY_CHAR(f, t) if (has_mbyte) mb_copy_char(&f, &t); else *t++ = *f++
  143. ! # define MB_CHARLEN(p)        (has_mbyte ? mb_charlen(p) : (int)STRLEN(p))
  144.   # define PTR2CHAR(p)        (has_mbyte ? mb_ptr2char(p) : (int)*(p))
  145.   #else
  146.   # define mb_ptr_adv(p)        ++p
  147. *** ../vim-7.2.179/src/main.c    2008-11-28 21:26:50.000000000 +0100
  148. --- src/main.c    2009-05-16 22:25:59.000000000 +0200
  149. ***************
  150. *** 1505,1514 ****
  151.    *
  152.    * Also find the --server... arguments and --socketid and --windowid
  153.    */
  154. - /*ARGSUSED*/
  155.       static void
  156.   early_arg_scan(parmp)
  157. !     mparm_T    *parmp;
  158.   {
  159.   #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
  160.       || !defined(FEAT_NETBEANS_INTG)
  161. --- 1505,1513 ----
  162.    *
  163.    * Also find the --server... arguments and --socketid and --windowid
  164.    */
  165.       static void
  166.   early_arg_scan(parmp)
  167. !     mparm_T    *parmp UNUSED;
  168.   {
  169.   #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
  170.       || !defined(FEAT_NETBEANS_INTG)
  171. ***************
  172. *** 2380,2389 ****
  173.    * Create the requested number of windows and edit buffers in them.
  174.    * Also does recovery if "recoverymode" set.
  175.    */
  176. - /*ARGSUSED*/
  177.       static void
  178.   create_windows(parmp)
  179. !     mparm_T    *parmp;
  180.   {
  181.   #ifdef FEAT_WINDOWS
  182.       int        dorewind;
  183. --- 2379,2387 ----
  184.    * Create the requested number of windows and edit buffers in them.
  185.    * Also does recovery if "recoverymode" set.
  186.    */
  187.       static void
  188.   create_windows(parmp)
  189. !     mparm_T    *parmp UNUSED;
  190.   {
  191.   #ifdef FEAT_WINDOWS
  192.       int        dorewind;
  193. ***************
  194. *** 3851,3860 ****
  195.    * return an allocated string.  Otherwise return "data".
  196.    * "*tofree" is set to the result when it needs to be freed later.
  197.    */
  198. - /*ARGSUSED*/
  199.       char_u *
  200.   serverConvert(client_enc, data, tofree)
  201. !     char_u *client_enc;
  202.       char_u *data;
  203.       char_u **tofree;
  204.   {
  205. --- 3849,3857 ----
  206.    * return an allocated string.  Otherwise return "data".
  207.    * "*tofree" is set to the result when it needs to be freed later.
  208.    */
  209.       char_u *
  210.   serverConvert(client_enc, data, tofree)
  211. !     char_u *client_enc UNUSED;
  212.       char_u *data;
  213.       char_u **tofree;
  214.   {
  215. *** ../vim-7.2.179/src/menu.c    2009-05-16 17:29:37.000000000 +0200
  216. --- src/menu.c    2009-05-16 22:29:31.000000000 +0200
  217. ***************
  218. *** 2340,2349 ****
  219.    * This function is also defined without the +multi_lang feature, in which
  220.    * case the commands are ignored.
  221.    */
  222. - /*ARGSUSED*/
  223.       void
  224.   ex_menutranslate(eap)
  225. !     exarg_T    *eap;
  226.   {
  227.   #ifdef FEAT_MULTI_LANG
  228.       char_u        *arg = eap->arg;
  229. --- 2340,2348 ----
  230.    * This function is also defined without the +multi_lang feature, in which
  231.    * case the commands are ignored.
  232.    */
  233.       void
  234.   ex_menutranslate(eap)
  235. !     exarg_T    *eap UNUSED;
  236.   {
  237.   #ifdef FEAT_MULTI_LANG
  238.       char_u        *arg = eap->arg;
  239. *** ../vim-7.2.179/src/message.c    2009-04-22 14:42:26.000000000 +0200
  240. --- src/message.c    2009-05-16 22:30:47.000000000 +0200
  241. ***************
  242. *** 818,827 ****
  243.   /*
  244.    * ":messages" command.
  245.    */
  246. - /*ARGSUSED*/
  247.       void
  248.   ex_messages(eap)
  249. !     exarg_T    *eap;
  250.   {
  251.       struct msg_hist *p;
  252.       char_u        *s;
  253. --- 818,826 ----
  254.   /*
  255.    * ":messages" command.
  256.    */
  257.       void
  258.   ex_messages(eap)
  259. !     exarg_T    *eap UNUSED;
  260.   {
  261.       struct msg_hist *p;
  262.       char_u        *s;
  263. ***************
  264. *** 3290,3304 ****
  265.    * A '&' in a button name becomes a shortcut, so each '&' should be before a
  266.    * different letter.
  267.    */
  268. - /* ARGSUSED */
  269.       int
  270.   do_dialog(type, title, message, buttons, dfltbutton, textfield)
  271. !     int        type;
  272. !     char_u    *title;
  273.       char_u    *message;
  274.       char_u    *buttons;
  275.       int        dfltbutton;
  276. !     char_u    *textfield;    /* IObuff for inputdialog(), NULL otherwise */
  277.   {
  278.       int        oldState;
  279.       int        retval = 0;
  280. --- 3289,3303 ----
  281.    * A '&' in a button name becomes a shortcut, so each '&' should be before a
  282.    * different letter.
  283.    */
  284.       int
  285.   do_dialog(type, title, message, buttons, dfltbutton, textfield)
  286. !     int        type UNUSED;
  287. !     char_u    *title UNUSED;
  288.       char_u    *message;
  289.       char_u    *buttons;
  290.       int        dfltbutton;
  291. !     char_u    *textfield UNUSED;    /* IObuff for inputdialog(), NULL
  292. !                        otherwise */
  293.   {
  294.       int        oldState;
  295.       int        retval = 0;
  296. ***************
  297. *** 4021,4027 ****
  298.       if (*p != '%')
  299.       {
  300.           char    *q = strchr(p + 1, '%');
  301. !         size_t  n = (q == NULL) ? STRLEN(p) : (q - p);
  302.   
  303.           /* Copy up to the next '%' or NUL without any changes. */
  304.           if (str_l < str_m)
  305. --- 4020,4026 ----
  306.       if (*p != '%')
  307.       {
  308.           char    *q = strchr(p + 1, '%');
  309. !         size_t  n = (q == NULL) ? STRLEN(p) : (size_t)(q - p);
  310.   
  311.           /* Copy up to the next '%' or NUL without any changes. */
  312.           if (str_l < str_m)
  313. ***************
  314. *** 4268,4274 ****
  315.                     precision <= (size_t)0x7fffffffL ? precision
  316.                                  : (size_t)0x7fffffffL);
  317.   #endif
  318. !             str_arg_l = (q == NULL) ? precision : q - str_arg;
  319.               }
  320.               break;
  321.   
  322. --- 4267,4274 ----
  323.                     precision <= (size_t)0x7fffffffL ? precision
  324.                                  : (size_t)0x7fffffffL);
  325.   #endif
  326. !             str_arg_l = (q == NULL) ? precision
  327. !                               : (size_t)(q - str_arg);
  328.               }
  329.               break;
  330.   
  331. ***************
  332. *** 4368,4374 ****
  333.                           get_a_arg(arg_idx);
  334.   #else
  335.   # if defined(FEAT_EVAL)
  336. !                         tvs != NULL ? tv_nr(tvs, &arg_idx) :
  337.   # endif
  338.                           va_arg(ap, unsigned int);
  339.   #endif
  340. --- 4368,4375 ----
  341.                           get_a_arg(arg_idx);
  342.   #else
  343.   # if defined(FEAT_EVAL)
  344. !                         tvs != NULL ? (unsigned)
  345. !                             tv_nr(tvs, &arg_idx) :
  346.   # endif
  347.                           va_arg(ap, unsigned int);
  348.   #endif
  349. ***************
  350. *** 4381,4387 ****
  351.                           get_a_arg(arg_idx);
  352.   #else
  353.   # if defined(FEAT_EVAL)
  354. !                         tvs != NULL ? tv_nr(tvs, &arg_idx) :
  355.   # endif
  356.                           va_arg(ap, unsigned long int);
  357.   #endif
  358. --- 4382,4389 ----
  359.                           get_a_arg(arg_idx);
  360.   #else
  361.   # if defined(FEAT_EVAL)
  362. !                         tvs != NULL ? (unsigned long)
  363. !                             tv_nr(tvs, &arg_idx) :
  364.   # endif
  365.                           va_arg(ap, unsigned long int);
  366.   #endif
  367. ***************
  368. *** 4704,4710 ****
  369.               size_t avail = str_m - str_l;
  370.   
  371.               vim_memset(str + str_l, zero_padding ? '0' : ' ',
  372. !                          (size_t)pn > avail ? avail : pn);
  373.               }
  374.               str_l += pn;
  375.           }
  376. --- 4706,4713 ----
  377.               size_t avail = str_m - str_l;
  378.   
  379.               vim_memset(str + str_l, zero_padding ? '0' : ' ',
  380. !                          (size_t)pn > avail ? avail
  381. !                                 : (size_t)pn);
  382.               }
  383.               str_l += pn;
  384.           }
  385. ***************
  386. *** 4731,4737 ****
  387.               size_t avail = str_m - str_l;
  388.   
  389.               mch_memmove(str + str_l, str_arg,
  390. !                          (size_t)zn > avail ? avail : zn);
  391.               }
  392.               str_l += zn;
  393.           }
  394. --- 4734,4741 ----
  395.               size_t avail = str_m - str_l;
  396.   
  397.               mch_memmove(str + str_l, str_arg,
  398. !                          (size_t)zn > avail ? avail
  399. !                                 : (size_t)zn);
  400.               }
  401.               str_l += zn;
  402.           }
  403. ***************
  404. *** 4746,4752 ****
  405.               size_t avail = str_m-str_l;
  406.   
  407.               vim_memset(str + str_l, '0',
  408. !                          (size_t)zn > avail ? avail : zn);
  409.               }
  410.               str_l += zn;
  411.           }
  412. --- 4750,4757 ----
  413.               size_t avail = str_m-str_l;
  414.   
  415.               vim_memset(str + str_l, '0',
  416. !                          (size_t)zn > avail ? avail
  417. !                                 : (size_t)zn);
  418.               }
  419.               str_l += zn;
  420.           }
  421. ***************
  422. *** 4765,4771 ****
  423.   
  424.               mch_memmove(str + str_l,
  425.                   str_arg + zero_padding_insertion_ind,
  426. !                 (size_t)sn > avail ? avail : sn);
  427.               }
  428.               str_l += sn;
  429.           }
  430. --- 4770,4776 ----
  431.   
  432.               mch_memmove(str + str_l,
  433.                   str_arg + zero_padding_insertion_ind,
  434. !                 (size_t)sn > avail ? avail : (size_t)sn);
  435.               }
  436.               str_l += sn;
  437.           }
  438. ***************
  439. *** 4785,4791 ****
  440.               size_t avail = str_m - str_l;
  441.   
  442.               vim_memset(str + str_l, ' ',
  443. !                          (size_t)pn > avail ? avail : pn);
  444.               }
  445.               str_l += pn;
  446.           }
  447. --- 4790,4797 ----
  448.               size_t avail = str_m - str_l;
  449.   
  450.               vim_memset(str + str_l, ' ',
  451. !                          (size_t)pn > avail ? avail
  452. !                                 : (size_t)pn);
  453.               }
  454.               str_l += pn;
  455.           }
  456. *** ../vim-7.2.179/src/misc1.c    2009-05-15 21:31:11.000000000 +0200
  457. --- src/misc1.c    2009-05-16 21:25:34.000000000 +0200
  458. ***************
  459. *** 4147,4156 ****
  460.   /*
  461.    * Function given to ExpandGeneric() to obtain an environment variable name.
  462.    */
  463. - /*ARGSUSED*/
  464.       char_u *
  465.   get_env_name(xp, idx)
  466. !     expand_T    *xp;
  467.       int        idx;
  468.   {
  469.   # if defined(AMIGA) || defined(__MRC__) || defined(__SC__)
  470. --- 4147,4155 ----
  471.   /*
  472.    * Function given to ExpandGeneric() to obtain an environment variable name.
  473.    */
  474.       char_u *
  475.   get_env_name(xp, idx)
  476. !     expand_T    *xp UNUSED;
  477.       int        idx;
  478.   {
  479.   # if defined(AMIGA) || defined(__MRC__) || defined(__SC__)
  480. ***************
  481. *** 4742,4750 ****
  482.        * If it is then restrict the search to below this line and try again.
  483.        */
  484.       line = ml_get(pos->lnum);
  485. !     for (p = line; *p && (unsigned)(p - line) < pos->col; ++p)
  486.           p = skip_string(p);
  487. !     if ((unsigned)(p - line) <= pos->col)
  488.           break;
  489.       cur_maxcomment = curwin->w_cursor.lnum - pos->lnum - 1;
  490.       if (cur_maxcomment <= 0)
  491. --- 4741,4749 ----
  492.        * If it is then restrict the search to below this line and try again.
  493.        */
  494.       line = ml_get(pos->lnum);
  495. !     for (p = line; *p && (colnr_T)(p - line) < pos->col; ++p)
  496.           p = skip_string(p);
  497. !     if ((colnr_T)(p - line) <= pos->col)
  498.           break;
  499.       cur_maxcomment = curwin->w_cursor.lnum - pos->lnum - 1;
  500.       if (cur_maxcomment <= 0)
  501. ***************
  502. *** 6275,6281 ****
  503.        * check for that.
  504.        */
  505.       if ((State & INSERT)
  506. !         && curwin->w_cursor.col < STRLEN(linecopy)
  507.           && linecopy[curwin->w_cursor.col] == ')')
  508.       linecopy[curwin->w_cursor.col] = NUL;
  509.   
  510. --- 6274,6280 ----
  511.        * check for that.
  512.        */
  513.       if ((State & INSERT)
  514. !         && curwin->w_cursor.col < (colnr_T)STRLEN(linecopy)
  515.           && linecopy[curwin->w_cursor.col] == ')')
  516.       linecopy[curwin->w_cursor.col] = NUL;
  517.   
  518. *** ../vim-7.2.179/src/mbyte.c    2008-11-28 21:26:50.000000000 +0100
  519. --- src/mbyte.c    2009-05-16 22:29:02.000000000 +0200
  520. ***************
  521. *** 1015,1024 ****
  522.    * Return length in bytes of character "c".
  523.    * Returns 1 for a single-byte character.
  524.    */
  525. - /* ARGSUSED */
  526.       int
  527.   latin_char2len(c)
  528. !     int        c;
  529.   {
  530.       return 1;
  531.   }
  532. --- 1015,1023 ----
  533.    * Return length in bytes of character "c".
  534.    * Returns 1 for a single-byte character.
  535.    */
  536.       int
  537.   latin_char2len(c)
  538. !     int        c UNUSED;
  539.   {
  540.       return 1;
  541.   }
  542. ***************
  543. *** 1248,1257 ****
  544.    * Return the number of display cells character at "*p" occupies.
  545.    * This doesn't take care of unprintable characters, use ptr2cells() for that.
  546.    */
  547. - /*ARGSUSED*/
  548.       int
  549.   latin_ptr2cells(p)
  550. !     char_u    *p;
  551.   {
  552.       return 1;
  553.   }
  554. --- 1247,1255 ----
  555.    * Return the number of display cells character at "*p" occupies.
  556.    * This doesn't take care of unprintable characters, use ptr2cells() for that.
  557.    */
  558.       int
  559.   latin_ptr2cells(p)
  560. !     char_u    *p UNUSED;
  561.   {
  562.       return 1;
  563.   }
  564. ***************
  565. *** 1293,1302 ****
  566.    * Return the number of display cells character "c" occupies.
  567.    * Only takes care of multi-byte chars, not "^C" and such.
  568.    */
  569. - /*ARGSUSED*/
  570.       int
  571.   latin_char2cells(c)
  572. !     int        c;
  573.   {
  574.       return 1;
  575.   }
  576. --- 1291,1299 ----
  577.    * Return the number of display cells character "c" occupies.
  578.    * Only takes care of multi-byte chars, not "^C" and such.
  579.    */
  580.       int
  581.   latin_char2cells(c)
  582. !     int        c UNUSED;
  583.   {
  584.       return 1;
  585.   }
  586. ***************
  587. *** 1318,1328 ****
  588.    * Return number of display cells for char at ScreenLines[off].
  589.    * We make sure that the offset used is less than "max_off".
  590.    */
  591. - /*ARGSUSED*/
  592.       int
  593.   latin_off2cells(off, max_off)
  594. !     unsigned    off;
  595. !     unsigned    max_off;
  596.   {
  597.       return 1;
  598.   }
  599. --- 1315,1324 ----
  600.    * Return number of display cells for char at ScreenLines[off].
  601.    * We make sure that the offset used is less than "max_off".
  602.    */
  603.       int
  604.   latin_off2cells(off, max_off)
  605. !     unsigned    off UNUSED;
  606. !     unsigned    max_off UNUSED;
  607.   {
  608.       return 1;
  609.   }
  610. ***************
  611. *** 2419,2429 ****
  612.    * Return offset from "p" to the first byte of the character it points into.
  613.    * Returns 0 when already at the first byte of a character.
  614.    */
  615. - /*ARGSUSED*/
  616.       int
  617.   latin_head_off(base, p)
  618. !     char_u    *base;
  619. !     char_u    *p;
  620.   {
  621.       return 0;
  622.   }
  623. --- 2415,2424 ----
  624.    * Return offset from "p" to the first byte of the character it points into.
  625.    * Returns 0 when already at the first byte of a character.
  626.    */
  627.       int
  628.   latin_head_off(base, p)
  629. !     char_u    *base UNUSED;
  630. !     char_u    *p UNUSED;
  631.   {
  632.       return 0;
  633.   }
  634. ***************
  635. *** 3131,3137 ****
  636.       else
  637.           s = p + 1;
  638.       }
  639. !     for (i = 0; s[i] != NUL && i < sizeof(buf) - 1; ++i)
  640.       {
  641.       if (s[i] == '_' || s[i] == '-')
  642.           buf[i] = '-';
  643. --- 3126,3132 ----
  644.       else
  645.           s = p + 1;
  646.       }
  647. !     for (i = 0; s[i] != NUL && i < (int)sizeof(buf) - 1; ++i)
  648.       {
  649.       if (s[i] == '_' || s[i] == '-')
  650.           buf[i] = '-';
  651. ***************
  652. *** 3582,3590 ****
  653.    * Callback invoked when the user finished preediting.
  654.    * Put the final string into the input buffer.
  655.    */
  656. - /*ARGSUSED0*/
  657.       static void
  658. ! im_commit_cb(GtkIMContext *context, const gchar *str, gpointer data)
  659.   {
  660.       int    slen = (int)STRLEN(str);
  661.       int    add_to_input = TRUE;
  662. --- 3577,3586 ----
  663.    * Callback invoked when the user finished preediting.
  664.    * Put the final string into the input buffer.
  665.    */
  666.       static void
  667. ! im_commit_cb(GtkIMContext *context UNUSED,
  668. !          const gchar *str,
  669. !          gpointer data UNUSED)
  670.   {
  671.       int    slen = (int)STRLEN(str);
  672.       int    add_to_input = TRUE;
  673. ***************
  674. *** 3670,3678 ****
  675.   /*
  676.    * Callback invoked after start to the preedit.
  677.    */
  678. - /*ARGSUSED*/
  679.       static void
  680. ! im_preedit_start_cb(GtkIMContext *context, gpointer data)
  681.   {
  682.   #ifdef XIM_DEBUG
  683.       xim_log("im_preedit_start_cb()\n");
  684. --- 3666,3673 ----
  685.   /*
  686.    * Callback invoked after start to the preedit.
  687.    */
  688.       static void
  689. ! im_preedit_start_cb(GtkIMContext *context UNUSED, gpointer data UNUSED)
  690.   {
  691.   #ifdef XIM_DEBUG
  692.       xim_log("im_preedit_start_cb()\n");
  693. ***************
  694. *** 3687,3695 ****
  695.   /*
  696.    * Callback invoked after end to the preedit.
  697.    */
  698. - /*ARGSUSED*/
  699.       static void
  700. ! im_preedit_end_cb(GtkIMContext *context, gpointer data)
  701.   {
  702.   #ifdef XIM_DEBUG
  703.       xim_log("im_preedit_end_cb()\n");
  704. --- 3682,3689 ----
  705.   /*
  706.    * Callback invoked after end to the preedit.
  707.    */
  708.       static void
  709. ! im_preedit_end_cb(GtkIMContext *context UNUSED, gpointer data UNUSED)
  710.   {
  711.   #ifdef XIM_DEBUG
  712.       xim_log("im_preedit_end_cb()\n");
  713. ***************
  714. *** 3748,3756 ****
  715.    * remaining input from within the "retrieve_surrounding" signal handler, this
  716.    * might not be necessary.  Gotta ask on vim-dev for opinions.
  717.    */
  718. - /*ARGSUSED1*/
  719.       static void
  720. ! im_preedit_changed_cb(GtkIMContext *context, gpointer data)
  721.   {
  722.       char    *preedit_string = NULL;
  723.       int        cursor_index    = 0;
  724. --- 3742,3749 ----
  725.    * remaining input from within the "retrieve_surrounding" signal handler, this
  726.    * might not be necessary.  Gotta ask on vim-dev for opinions.
  727.    */
  728.       static void
  729. ! im_preedit_changed_cb(GtkIMContext *context, gpointer data UNUSED)
  730.   {
  731.       char    *preedit_string = NULL;
  732.       int        cursor_index    = 0;
  733. ***************
  734. *** 4616,4626 ****
  735.       }
  736.   }
  737.   
  738. - /*ARGSUSED*/
  739.       void
  740.   im_set_position(row, col)
  741. !     int        row;
  742. !     int        col;
  743.   {
  744.       xim_set_preedit();
  745.   }
  746. --- 4609,4618 ----
  747.       }
  748.   }
  749.   
  750.       void
  751.   im_set_position(row, col)
  752. !     int        row UNUSED;
  753. !     int        col UNUSED;
  754.   {
  755.       xim_set_preedit();
  756.   }
  757. ***************
  758. *** 4927,4938 ****
  759.   static void xim_instantiate_cb __ARGS((Display *display, XPointer client_data, XPointer    call_data));
  760.   static void xim_destroy_cb __ARGS((XIM im, XPointer client_data, XPointer call_data));
  761.   
  762. - /*ARGSUSED*/
  763.       static void
  764.   xim_instantiate_cb(display, client_data, call_data)
  765.       Display    *display;
  766. !     XPointer    client_data;
  767. !     XPointer    call_data;
  768.   {
  769.       Window    x11_window;
  770.       Display    *x11_display;
  771. --- 4919,4929 ----
  772.   static void xim_instantiate_cb __ARGS((Display *display, XPointer client_data, XPointer    call_data));
  773.   static void xim_destroy_cb __ARGS((XIM im, XPointer client_data, XPointer call_data));
  774.   
  775.       static void
  776.   xim_instantiate_cb(display, client_data, call_data)
  777.       Display    *display;
  778. !     XPointer    client_data UNUSED;
  779. !     XPointer    call_data UNUSED;
  780.   {
  781.       Window    x11_window;
  782.       Display    *x11_display;
  783. ***************
  784. *** 4952,4963 ****
  785.                        xim_instantiate_cb, NULL);
  786.   }
  787.   
  788. - /*ARGSUSED*/
  789.       static void
  790.   xim_destroy_cb(im, client_data, call_data)
  791. !     XIM        im;
  792. !     XPointer    client_data;
  793. !     XPointer    call_data;
  794.   {
  795.       Window    x11_window;
  796.       Display    *x11_display;
  797. --- 4943,4953 ----
  798.                        xim_instantiate_cb, NULL);
  799.   }
  800.   
  801.       static void
  802.   xim_destroy_cb(im, client_data, call_data)
  803. !     XIM        im UNUSED;
  804. !     XPointer    client_data UNUSED;
  805. !     XPointer    call_data UNUSED;
  806.   {
  807.       Window    x11_window;
  808.       Display    *x11_display;
  809. ***************
  810. *** 5276,5284 ****
  811.       }
  812.   }
  813.   
  814. - /*ARGSUSED*/
  815.       static void
  816. ! preedit_start_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
  817.   {
  818.   #ifdef XIM_DEBUG
  819.       xim_log("xim_decide_input_style()\n");
  820. --- 5266,5275 ----
  821.       }
  822.   }
  823.   
  824.       static void
  825. ! preedit_start_cbproc(XIC thexic UNUSED,
  826. !                  XPointer client_data UNUSED,
  827. !              XPointer call_data UNUSED)
  828.   {
  829.   #ifdef XIM_DEBUG
  830.       xim_log("xim_decide_input_style()\n");
  831. ***************
  832. *** 5310,5318 ****
  833.   static GSList *key_press_event_queue = NULL;
  834.   static gboolean processing_queued_event = FALSE;
  835.   
  836. - /*ARGSUSED*/
  837.       static void
  838. ! preedit_draw_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
  839.   {
  840.       XIMPreeditDrawCallbackStruct *draw_data;
  841.       XIMText    *text;
  842. --- 5301,5310 ----
  843.   static GSList *key_press_event_queue = NULL;
  844.   static gboolean processing_queued_event = FALSE;
  845.   
  846.       static void
  847. ! preedit_draw_cbproc(XIC thexic UNUSED,
  848. !             XPointer client_data UNUSED,
  849. !             XPointer call_data)
  850.   {
  851.       XIMPreeditDrawCallbackStruct *draw_data;
  852.       XIMText    *text;
  853. ***************
  854. *** 5451,5468 ****
  855.       return -1;
  856.   }
  857.   
  858. - /*ARGSUSED*/
  859.       static void
  860. ! preedit_caret_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
  861.   {
  862.   #ifdef XIM_DEBUG
  863.       xim_log("preedit_caret_cbproc()\n");
  864.   #endif
  865.   }
  866.   
  867. - /*ARGSUSED*/
  868.       static void
  869. ! preedit_done_cbproc(XIC thexic, XPointer client_data, XPointer call_data)
  870.   {
  871.   #ifdef XIM_DEBUG
  872.       xim_log("preedit_done_cbproc()\n");
  873. --- 5443,5462 ----
  874.       return -1;
  875.   }
  876.   
  877.       static void
  878. ! preedit_caret_cbproc(XIC thexic UNUSED,
  879. !              XPointer client_data UNUSED,
  880. !              XPointer call_data UNUSED)
  881.   {
  882.   #ifdef XIM_DEBUG
  883.       xim_log("preedit_caret_cbproc()\n");
  884.   #endif
  885.   }
  886.   
  887.       static void
  888. ! preedit_done_cbproc(XIC thexic UNUSED,
  889. !             XPointer client_data UNUSED,
  890. !             XPointer call_data UNUSED)
  891.   {
  892.   #ifdef XIM_DEBUG
  893.       xim_log("preedit_done_cbproc()\n");
  894. ***************
  895. *** 5501,5509 ****
  896.       }
  897.   }
  898.   
  899. - /*ARGSUSED*/
  900.       int
  901. ! xim_queue_key_press_event(GdkEventKey *event, int down)
  902.   {
  903.   #ifdef XIM_DEBUG
  904.       xim_log("xim_queue_key_press_event()\n");
  905. --- 5495,5502 ----
  906.       }
  907.   }
  908.   
  909.       int
  910. ! xim_queue_key_press_event(GdkEventKey *event, int down UNUSED)
  911.   {
  912.   #ifdef XIM_DEBUG
  913.       xim_log("xim_queue_key_press_event()\n");
  914. ***************
  915. *** 5519,5527 ****
  916.       return TRUE;
  917.   }
  918.   
  919. - /*ARGSUSED*/
  920.       static void
  921. ! preedit_callback_setup(GdkIC *ic)
  922.   {
  923.       XIC xxic;
  924.       XVaNestedList preedit_attr;
  925. --- 5512,5519 ----
  926.       return TRUE;
  927.   }
  928.   
  929.       static void
  930. ! preedit_callback_setup(GdkIC *ic UNUSED)
  931.   {
  932.       XIC xxic;
  933.       XVaNestedList preedit_attr;
  934. ***************
  935. *** 5546,5554 ****
  936.       XFree(preedit_attr);
  937.   }
  938.   
  939. - /*ARGSUSED*/
  940.       static void
  941. ! reset_state_setup(GdkIC *ic)
  942.   {
  943.   #ifdef USE_X11R6_XIM
  944.       /* don't change the input context when we call reset */
  945. --- 5538,5545 ----
  946.       XFree(preedit_attr);
  947.   }
  948.   
  949.       static void
  950. ! reset_state_setup(GdkIC *ic UNUSED)
  951.   {
  952.   #ifdef USE_X11R6_XIM
  953.       /* don't change the input context when we call reset */
  954. *** ../vim-7.2.179/src/normal.c    2009-05-15 21:31:11.000000000 +0200
  955. --- src/normal.c    2009-05-16 22:31:10.000000000 +0200
  956. ***************
  957. *** 9243,9252 ****
  958.   }
  959.   
  960.   #ifdef FEAT_SNIFF
  961. - /*ARGSUSED*/
  962.       static void
  963.   nv_sniff(cap)
  964. !     cmdarg_T    *cap;
  965.   {
  966.       ProcessSniffRequests();
  967.   }
  968. --- 9243,9251 ----
  969.   }
  970.   
  971.   #ifdef FEAT_SNIFF
  972.       static void
  973.   nv_sniff(cap)
  974. !     cmdarg_T    *cap UNUSED;
  975.   {
  976.       ProcessSniffRequests();
  977.   }
  978. ***************
  979. *** 9262,9271 ****
  980.   #endif
  981.   
  982.   #ifdef FEAT_DND
  983. - /*ARGSUSED*/
  984.       static void
  985.   nv_drop(cap)
  986. !     cmdarg_T    *cap;
  987.   {
  988.       do_put('~', BACKWARD, 1L, PUT_CURSEND);
  989.   }
  990. --- 9261,9269 ----
  991.   #endif
  992.   
  993.   #ifdef FEAT_DND
  994.       static void
  995.   nv_drop(cap)
  996. !     cmdarg_T    *cap UNUSED;
  997.   {
  998.       do_put('~', BACKWARD, 1L, PUT_CURSEND);
  999.   }
  1000. ***************
  1001. *** 9277,9283 ****
  1002.    * When waiting for a character for 'updatetime' K_CURSORHOLD is put in the
  1003.    * input buffer.  "did_cursorhold" is set to avoid retriggering.
  1004.    */
  1005. - /*ARGSUSED*/
  1006.       static void
  1007.   nv_cursorhold(cap)
  1008.       cmdarg_T    *cap;
  1009. --- 9275,9280 ----
  1010. *** ../vim-7.2.179/src/option.c    2009-05-15 21:31:11.000000000 +0200
  1011. --- src/option.c    2009-05-17 12:13:52.000000000 +0200
  1012. ***************
  1013. *** 387,392 ****
  1014. --- 387,395 ----
  1015.       char_u    *def_val[2];    /* default values for variable (vi and vim) */
  1016.   #ifdef FEAT_EVAL
  1017.       scid_T    scriptID;    /* script in which the option was last set */
  1018. + # define SCRIPTID_INIT , 0
  1019. + #else
  1020. + # define SCRIPTID_INIT
  1021.   #endif
  1022.   };
  1023.   
  1024. ***************
  1025. *** 477,483 ****
  1026.   #else
  1027.                   (char_u *)224L,
  1028.   #endif
  1029. !                         (char_u *)0L}},
  1030.       {"antialias",   "anti", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
  1031.   #if defined(FEAT_GUI) && defined(MACOS_X)
  1032.                   (char_u *)&p_antialias, PV_NONE,
  1033. --- 480,486 ----
  1034.   #else
  1035.                   (char_u *)224L,
  1036.   #endif
  1037. !                         (char_u *)0L} SCRIPTID_INIT},
  1038.       {"antialias",   "anti", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
  1039.   #if defined(FEAT_GUI) && defined(MACOS_X)
  1040.                   (char_u *)&p_antialias, PV_NONE,
  1041. ***************
  1042. *** 486,520 ****
  1043.                   (char_u *)NULL, PV_NONE,
  1044.                   {(char_u *)FALSE, (char_u *)FALSE}
  1045.   #endif
  1046. !                 },
  1047.       {"arabic",        "arab", P_BOOL|P_VI_DEF|P_VIM,
  1048.   #ifdef FEAT_ARABIC
  1049.                   (char_u *)VAR_WIN, PV_ARAB,
  1050.   #else
  1051.                   (char_u *)NULL, PV_NONE,
  1052.   #endif
  1053. !                 {(char_u *)FALSE, (char_u *)0L}},
  1054.       {"arabicshape", "arshape", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
  1055.   #ifdef FEAT_ARABIC
  1056.                   (char_u *)&p_arshape, PV_NONE,
  1057.   #else
  1058.                   (char_u *)NULL, PV_NONE,
  1059.   #endif
  1060. !                 {(char_u *)TRUE, (char_u *)0L}},
  1061.       {"allowrevins", "ari",  P_BOOL|P_VI_DEF|P_VIM,
  1062.   #ifdef FEAT_RIGHTLEFT
  1063.                   (char_u *)&p_ari, PV_NONE,
  1064.   #else
  1065.                   (char_u *)NULL, PV_NONE,
  1066.   #endif
  1067. !                 {(char_u *)FALSE, (char_u *)0L}},
  1068.       {"altkeymap",   "akm",  P_BOOL|P_VI_DEF,
  1069.   #ifdef FEAT_FKMAP
  1070.                   (char_u *)&p_altkeymap, PV_NONE,
  1071.   #else
  1072.                   (char_u *)NULL, PV_NONE,
  1073.   #endif
  1074. !                 {(char_u *)FALSE, (char_u *)0L}},
  1075.       {"ambiwidth",  "ambw",  P_STRING|P_VI_DEF|P_RCLR,
  1076.   #if defined(FEAT_MBYTE)
  1077.                   (char_u *)&p_ambw, PV_NONE,
  1078. --- 489,523 ----
  1079.                   (char_u *)NULL, PV_NONE,
  1080.                   {(char_u *)FALSE, (char_u *)FALSE}
  1081.   #endif
  1082. !                 SCRIPTID_INIT},
  1083.       {"arabic",        "arab", P_BOOL|P_VI_DEF|P_VIM,
  1084.   #ifdef FEAT_ARABIC
  1085.                   (char_u *)VAR_WIN, PV_ARAB,
  1086.   #else
  1087.                   (char_u *)NULL, PV_NONE,
  1088.   #endif
  1089. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1090.       {"arabicshape", "arshape", P_BOOL|P_VI_DEF|P_VIM|P_RCLR,
  1091.   #ifdef FEAT_ARABIC
  1092.                   (char_u *)&p_arshape, PV_NONE,
  1093.   #else
  1094.                   (char_u *)NULL, PV_NONE,
  1095.   #endif
  1096. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  1097.       {"allowrevins", "ari",  P_BOOL|P_VI_DEF|P_VIM,
  1098.   #ifdef FEAT_RIGHTLEFT
  1099.                   (char_u *)&p_ari, PV_NONE,
  1100.   #else
  1101.                   (char_u *)NULL, PV_NONE,
  1102.   #endif
  1103. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1104.       {"altkeymap",   "akm",  P_BOOL|P_VI_DEF,
  1105.   #ifdef FEAT_FKMAP
  1106.                   (char_u *)&p_altkeymap, PV_NONE,
  1107.   #else
  1108.                   (char_u *)NULL, PV_NONE,
  1109.   #endif
  1110. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1111.       {"ambiwidth",  "ambw",  P_STRING|P_VI_DEF|P_RCLR,
  1112.   #if defined(FEAT_MBYTE)
  1113.                   (char_u *)&p_ambw, PV_NONE,
  1114. ***************
  1115. *** 523,549 ****
  1116.                   (char_u *)NULL, PV_NONE,
  1117.                   {(char_u *)0L, (char_u *)0L}
  1118.   #endif
  1119. !                 },
  1120.   #ifdef FEAT_AUTOCHDIR
  1121.       {"autochdir",  "acd",   P_BOOL|P_VI_DEF,
  1122.                   (char_u *)&p_acd, PV_NONE,
  1123. !                 {(char_u *)FALSE, (char_u *)0L}},
  1124.   #endif
  1125.       {"autoindent",  "ai",   P_BOOL|P_VI_DEF,
  1126.                   (char_u *)&p_ai, PV_AI,
  1127. !                 {(char_u *)FALSE, (char_u *)0L}},
  1128.       {"autoprint",   "ap",   P_BOOL|P_VI_DEF,
  1129.                   (char_u *)NULL, PV_NONE,
  1130. !                 {(char_u *)FALSE, (char_u *)0L}},
  1131.       {"autoread",    "ar",   P_BOOL|P_VI_DEF,
  1132.                   (char_u *)&p_ar, PV_AR,
  1133. !                 {(char_u *)FALSE, (char_u *)0L}},
  1134.       {"autowrite",   "aw",   P_BOOL|P_VI_DEF,
  1135.                   (char_u *)&p_aw, PV_NONE,
  1136. !                 {(char_u *)FALSE, (char_u *)0L}},
  1137.       {"autowriteall","awa",  P_BOOL|P_VI_DEF,
  1138.                   (char_u *)&p_awa, PV_NONE,
  1139. !                 {(char_u *)FALSE, (char_u *)0L}},
  1140.       {"background",  "bg",   P_STRING|P_VI_DEF|P_RCLR,
  1141.                   (char_u *)&p_bg, PV_NONE,
  1142.                   {
  1143. --- 526,552 ----
  1144.                   (char_u *)NULL, PV_NONE,
  1145.                   {(char_u *)0L, (char_u *)0L}
  1146.   #endif
  1147. !                 SCRIPTID_INIT},
  1148.   #ifdef FEAT_AUTOCHDIR
  1149.       {"autochdir",  "acd",   P_BOOL|P_VI_DEF,
  1150.                   (char_u *)&p_acd, PV_NONE,
  1151. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1152.   #endif
  1153.       {"autoindent",  "ai",   P_BOOL|P_VI_DEF,
  1154.                   (char_u *)&p_ai, PV_AI,
  1155. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1156.       {"autoprint",   "ap",   P_BOOL|P_VI_DEF,
  1157.                   (char_u *)NULL, PV_NONE,
  1158. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1159.       {"autoread",    "ar",   P_BOOL|P_VI_DEF,
  1160.                   (char_u *)&p_ar, PV_AR,
  1161. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1162.       {"autowrite",   "aw",   P_BOOL|P_VI_DEF,
  1163.                   (char_u *)&p_aw, PV_NONE,
  1164. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1165.       {"autowriteall","awa",  P_BOOL|P_VI_DEF,
  1166.                   (char_u *)&p_awa, PV_NONE,
  1167. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1168.       {"background",  "bg",   P_STRING|P_VI_DEF|P_RCLR,
  1169.                   (char_u *)&p_bg, PV_NONE,
  1170.                   {
  1171. ***************
  1172. *** 552,564 ****
  1173.   #else
  1174.                   (char_u *)"light",
  1175.   #endif
  1176. !                         (char_u *)0L}},
  1177.       {"backspace",   "bs",   P_STRING|P_VI_DEF|P_VIM|P_COMMA|P_NODUP,
  1178.                   (char_u *)&p_bs, PV_NONE,
  1179. !                 {(char_u *)"", (char_u *)0L}},
  1180.       {"backup",        "bk",   P_BOOL|P_VI_DEF|P_VIM,
  1181.                   (char_u *)&p_bk, PV_NONE,
  1182. !                 {(char_u *)FALSE, (char_u *)0L}},
  1183.       {"backupcopy",  "bkc",  P_STRING|P_VIM|P_COMMA|P_NODUP,
  1184.                   (char_u *)&p_bkc, PV_NONE,
  1185.   #ifdef UNIX
  1186. --- 555,567 ----
  1187.   #else
  1188.                   (char_u *)"light",
  1189.   #endif
  1190. !                         (char_u *)0L} SCRIPTID_INIT},
  1191.       {"backspace",   "bs",   P_STRING|P_VI_DEF|P_VIM|P_COMMA|P_NODUP,
  1192.                   (char_u *)&p_bs, PV_NONE,
  1193. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  1194.       {"backup",        "bk",   P_BOOL|P_VI_DEF|P_VIM,
  1195.                   (char_u *)&p_bk, PV_NONE,
  1196. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1197.       {"backupcopy",  "bkc",  P_STRING|P_VIM|P_COMMA|P_NODUP,
  1198.                   (char_u *)&p_bkc, PV_NONE,
  1199.   #ifdef UNIX
  1200. ***************
  1201. *** 566,575 ****
  1202.   #else
  1203.                   {(char_u *)"auto", (char_u *)"auto"}
  1204.   #endif
  1205. !                 },
  1206.       {"backupdir",   "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
  1207.                   (char_u *)&p_bdir, PV_NONE,
  1208. !                 {(char_u *)DFLT_BDIR, (char_u *)0L}},
  1209.       {"backupext",   "bex",  P_STRING|P_VI_DEF|P_NFNAME,
  1210.                   (char_u *)&p_bex, PV_NONE,
  1211.                   {
  1212. --- 569,578 ----
  1213.   #else
  1214.                   {(char_u *)"auto", (char_u *)"auto"}
  1215.   #endif
  1216. !                 SCRIPTID_INIT},
  1217.       {"backupdir",   "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
  1218.                   (char_u *)&p_bdir, PV_NONE,
  1219. !                 {(char_u *)DFLT_BDIR, (char_u *)0L} SCRIPTID_INIT},
  1220.       {"backupext",   "bex",  P_STRING|P_VI_DEF|P_NFNAME,
  1221.                   (char_u *)&p_bex, PV_NONE,
  1222.                   {
  1223. ***************
  1224. *** 578,584 ****
  1225.   #else
  1226.                   (char_u *)"~",
  1227.   #endif
  1228. !                         (char_u *)0L}},
  1229.       {"backupskip",  "bsk",  P_STRING|P_VI_DEF|P_COMMA,
  1230.   #ifdef FEAT_WILDIGN
  1231.                   (char_u *)&p_bsk, PV_NONE,
  1232. --- 581,587 ----
  1233.   #else
  1234.                   (char_u *)"~",
  1235.   #endif
  1236. !                         (char_u *)0L} SCRIPTID_INIT},
  1237.       {"backupskip",  "bsk",  P_STRING|P_VI_DEF|P_COMMA,
  1238.   #ifdef FEAT_WILDIGN
  1239.                   (char_u *)&p_bsk, PV_NONE,
  1240. ***************
  1241. *** 587,626 ****
  1242.                   (char_u *)NULL, PV_NONE,
  1243.                   {(char_u *)0L, (char_u *)0L}
  1244.   #endif
  1245. !                 },
  1246.   #ifdef FEAT_BEVAL
  1247.       {"balloondelay","bdlay",P_NUM|P_VI_DEF,
  1248.                   (char_u *)&p_bdlay, PV_NONE,
  1249. !                 {(char_u *)600L, (char_u *)0L}},
  1250.       {"ballooneval", "beval",P_BOOL|P_VI_DEF|P_NO_MKRC,
  1251.                   (char_u *)&p_beval, PV_NONE,
  1252. !                 {(char_u *)FALSE, (char_u *)0L}},
  1253.   # ifdef FEAT_EVAL
  1254.       {"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
  1255.                   (char_u *)&p_bexpr, PV_BEXPR,
  1256. !                 {(char_u *)"", (char_u *)0L}},
  1257.   # endif
  1258.   #endif
  1259.       {"beautify",    "bf",   P_BOOL|P_VI_DEF,
  1260.                   (char_u *)NULL, PV_NONE,
  1261. !                 {(char_u *)FALSE, (char_u *)0L}},
  1262.       {"binary",        "bin",  P_BOOL|P_VI_DEF|P_RSTAT,
  1263.                   (char_u *)&p_bin, PV_BIN,
  1264. !                 {(char_u *)FALSE, (char_u *)0L}},
  1265.       {"bioskey",        "biosk",P_BOOL|P_VI_DEF,
  1266.   #ifdef MSDOS
  1267.                   (char_u *)&p_biosk, PV_NONE,
  1268.   #else
  1269.                   (char_u *)NULL, PV_NONE,
  1270.   #endif
  1271. !                 {(char_u *)TRUE, (char_u *)0L}},
  1272.       {"bomb",        NULL,   P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
  1273.   #ifdef FEAT_MBYTE
  1274.                   (char_u *)&p_bomb, PV_BOMB,
  1275.   #else
  1276.                   (char_u *)NULL, PV_NONE,
  1277.   #endif
  1278. !                 {(char_u *)FALSE, (char_u *)0L}},
  1279.       {"breakat",        "brk",  P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST,
  1280.   #ifdef FEAT_LINEBREAK
  1281.                   (char_u *)&p_breakat, PV_NONE,
  1282. --- 590,629 ----
  1283.                   (char_u *)NULL, PV_NONE,
  1284.                   {(char_u *)0L, (char_u *)0L}
  1285.   #endif
  1286. !                 SCRIPTID_INIT},
  1287.   #ifdef FEAT_BEVAL
  1288.       {"balloondelay","bdlay",P_NUM|P_VI_DEF,
  1289.                   (char_u *)&p_bdlay, PV_NONE,
  1290. !                 {(char_u *)600L, (char_u *)0L} SCRIPTID_INIT},
  1291.       {"ballooneval", "beval",P_BOOL|P_VI_DEF|P_NO_MKRC,
  1292.                   (char_u *)&p_beval, PV_NONE,
  1293. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1294.   # ifdef FEAT_EVAL
  1295.       {"balloonexpr", "bexpr", P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
  1296.                   (char_u *)&p_bexpr, PV_BEXPR,
  1297. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  1298.   # endif
  1299.   #endif
  1300.       {"beautify",    "bf",   P_BOOL|P_VI_DEF,
  1301.                   (char_u *)NULL, PV_NONE,
  1302. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1303.       {"binary",        "bin",  P_BOOL|P_VI_DEF|P_RSTAT,
  1304.                   (char_u *)&p_bin, PV_BIN,
  1305. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1306.       {"bioskey",        "biosk",P_BOOL|P_VI_DEF,
  1307.   #ifdef MSDOS
  1308.                   (char_u *)&p_biosk, PV_NONE,
  1309.   #else
  1310.                   (char_u *)NULL, PV_NONE,
  1311.   #endif
  1312. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  1313.       {"bomb",        NULL,   P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
  1314.   #ifdef FEAT_MBYTE
  1315.                   (char_u *)&p_bomb, PV_BOMB,
  1316.   #else
  1317.                   (char_u *)NULL, PV_NONE,
  1318.   #endif
  1319. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1320.       {"breakat",        "brk",  P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST,
  1321.   #ifdef FEAT_LINEBREAK
  1322.                   (char_u *)&p_breakat, PV_NONE,
  1323. ***************
  1324. *** 629,635 ****
  1325.                   (char_u *)NULL, PV_NONE,
  1326.                   {(char_u *)0L, (char_u *)0L}
  1327.   #endif
  1328. !                 },
  1329.       {"browsedir",   "bsdir",P_STRING|P_VI_DEF,
  1330.   #ifdef FEAT_BROWSE
  1331.                   (char_u *)&p_bsdir, PV_NONE,
  1332. --- 632,638 ----
  1333.                   (char_u *)NULL, PV_NONE,
  1334.                   {(char_u *)0L, (char_u *)0L}
  1335.   #endif
  1336. !                 SCRIPTID_INIT},
  1337.       {"browsedir",   "bsdir",P_STRING|P_VI_DEF,
  1338.   #ifdef FEAT_BROWSE
  1339.                   (char_u *)&p_bsdir, PV_NONE,
  1340. ***************
  1341. *** 638,644 ****
  1342.                   (char_u *)NULL, PV_NONE,
  1343.                   {(char_u *)0L, (char_u *)0L}
  1344.   #endif
  1345. !                 },
  1346.       {"bufhidden",   "bh",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB,
  1347.   #if defined(FEAT_QUICKFIX)
  1348.                   (char_u *)&p_bh, PV_BH,
  1349. --- 641,647 ----
  1350.                   (char_u *)NULL, PV_NONE,
  1351.                   {(char_u *)0L, (char_u *)0L}
  1352.   #endif
  1353. !                 SCRIPTID_INIT},
  1354.       {"bufhidden",   "bh",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB,
  1355.   #if defined(FEAT_QUICKFIX)
  1356.                   (char_u *)&p_bh, PV_BH,
  1357. ***************
  1358. *** 647,657 ****
  1359.                   (char_u *)NULL, PV_NONE,
  1360.                   {(char_u *)0L, (char_u *)0L}
  1361.   #endif
  1362. !                 },
  1363.       {"buflisted",   "bl",   P_BOOL|P_VI_DEF|P_NOGLOB,
  1364.                   (char_u *)&p_bl, PV_BL,
  1365.                   {(char_u *)1L, (char_u *)0L}
  1366. !                 },
  1367.       {"buftype",        "bt",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB,
  1368.   #if defined(FEAT_QUICKFIX)
  1369.                   (char_u *)&p_bt, PV_BT,
  1370. --- 650,660 ----
  1371.                   (char_u *)NULL, PV_NONE,
  1372.                   {(char_u *)0L, (char_u *)0L}
  1373.   #endif
  1374. !                 SCRIPTID_INIT},
  1375.       {"buflisted",   "bl",   P_BOOL|P_VI_DEF|P_NOGLOB,
  1376.                   (char_u *)&p_bl, PV_BL,
  1377.                   {(char_u *)1L, (char_u *)0L}
  1378. !                 SCRIPTID_INIT},
  1379.       {"buftype",        "bt",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB,
  1380.   #if defined(FEAT_QUICKFIX)
  1381.                   (char_u *)&p_bt, PV_BT,
  1382. ***************
  1383. *** 660,666 ****
  1384.                   (char_u *)NULL, PV_NONE,
  1385.                   {(char_u *)0L, (char_u *)0L}
  1386.   #endif
  1387. !                 },
  1388.       {"casemap",        "cmp",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  1389.   #ifdef FEAT_MBYTE
  1390.                   (char_u *)&p_cmp, PV_NONE,
  1391. --- 663,669 ----
  1392.                   (char_u *)NULL, PV_NONE,
  1393.                   {(char_u *)0L, (char_u *)0L}
  1394.   #endif
  1395. !                 SCRIPTID_INIT},
  1396.       {"casemap",        "cmp",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  1397.   #ifdef FEAT_MBYTE
  1398.                   (char_u *)&p_cmp, PV_NONE,
  1399. ***************
  1400. *** 669,675 ****
  1401.                   (char_u *)NULL, PV_NONE,
  1402.                   {(char_u *)0L, (char_u *)0L}
  1403.   #endif
  1404. !                 },
  1405.       {"cdpath",        "cd",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
  1406.   #ifdef FEAT_SEARCHPATH
  1407.                   (char_u *)&p_cdpath, PV_NONE,
  1408. --- 672,678 ----
  1409.                   (char_u *)NULL, PV_NONE,
  1410.                   {(char_u *)0L, (char_u *)0L}
  1411.   #endif
  1412. !                 SCRIPTID_INIT},
  1413.       {"cdpath",        "cd",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
  1414.   #ifdef FEAT_SEARCHPATH
  1415.                   (char_u *)&p_cdpath, PV_NONE,
  1416. ***************
  1417. *** 678,684 ****
  1418.                   (char_u *)NULL, PV_NONE,
  1419.                   {(char_u *)0L, (char_u *)0L}
  1420.   #endif
  1421. !                 },
  1422.       {"cedit",        NULL,   P_STRING,
  1423.   #ifdef FEAT_CMDWIN
  1424.                   (char_u *)&p_cedit, PV_NONE,
  1425. --- 681,687 ----
  1426.                   (char_u *)NULL, PV_NONE,
  1427.                   {(char_u *)0L, (char_u *)0L}
  1428.   #endif
  1429. !                 SCRIPTID_INIT},
  1430.       {"cedit",        NULL,   P_STRING,
  1431.   #ifdef FEAT_CMDWIN
  1432.                   (char_u *)&p_cedit, PV_NONE,
  1433. ***************
  1434. *** 687,693 ****
  1435.                   (char_u *)NULL, PV_NONE,
  1436.                   {(char_u *)0L, (char_u *)0L}
  1437.   #endif
  1438. !                 },
  1439.       {"charconvert",  "ccv", P_STRING|P_VI_DEF|P_SECURE,
  1440.   #if defined(FEAT_MBYTE) && defined(FEAT_EVAL)
  1441.                   (char_u *)&p_ccv, PV_NONE,
  1442. --- 690,696 ----
  1443.                   (char_u *)NULL, PV_NONE,
  1444.                   {(char_u *)0L, (char_u *)0L}
  1445.   #endif
  1446. !                 SCRIPTID_INIT},
  1447.       {"charconvert",  "ccv", P_STRING|P_VI_DEF|P_SECURE,
  1448.   #if defined(FEAT_MBYTE) && defined(FEAT_EVAL)
  1449.                   (char_u *)&p_ccv, PV_NONE,
  1450. ***************
  1451. *** 696,709 ****
  1452.                   (char_u *)NULL, PV_NONE,
  1453.                   {(char_u *)0L, (char_u *)0L}
  1454.   #endif
  1455. !                 },
  1456.       {"cindent",        "cin",  P_BOOL|P_VI_DEF|P_VIM,
  1457.   #ifdef FEAT_CINDENT
  1458.                   (char_u *)&p_cin, PV_CIN,
  1459.   #else
  1460.                   (char_u *)NULL, PV_NONE,
  1461.   #endif
  1462. !                 {(char_u *)FALSE, (char_u *)0L}},
  1463.       {"cinkeys",        "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  1464.   #ifdef FEAT_CINDENT
  1465.                   (char_u *)&p_cink, PV_CINK,
  1466. --- 699,712 ----
  1467.                   (char_u *)NULL, PV_NONE,
  1468.                   {(char_u *)0L, (char_u *)0L}
  1469.   #endif
  1470. !                 SCRIPTID_INIT},
  1471.       {"cindent",        "cin",  P_BOOL|P_VI_DEF|P_VIM,
  1472.   #ifdef FEAT_CINDENT
  1473.                   (char_u *)&p_cin, PV_CIN,
  1474.   #else
  1475.                   (char_u *)NULL, PV_NONE,
  1476.   #endif
  1477. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1478.       {"cinkeys",        "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  1479.   #ifdef FEAT_CINDENT
  1480.                   (char_u *)&p_cink, PV_CINK,
  1481. ***************
  1482. *** 712,725 ****
  1483.                   (char_u *)NULL, PV_NONE,
  1484.                   {(char_u *)0L, (char_u *)0L}
  1485.   #endif
  1486. !                 },
  1487.       {"cinoptions",  "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  1488.   #ifdef FEAT_CINDENT
  1489.                   (char_u *)&p_cino, PV_CINO,
  1490.   #else
  1491.                   (char_u *)NULL, PV_NONE,
  1492.   #endif
  1493. !                 {(char_u *)"", (char_u *)0L}},
  1494.       {"cinwords",    "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  1495.   #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
  1496.                   (char_u *)&p_cinw, PV_CINW,
  1497. --- 715,728 ----
  1498.                   (char_u *)NULL, PV_NONE,
  1499.                   {(char_u *)0L, (char_u *)0L}
  1500.   #endif
  1501. !                 SCRIPTID_INIT},
  1502.       {"cinoptions",  "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  1503.   #ifdef FEAT_CINDENT
  1504.                   (char_u *)&p_cino, PV_CINO,
  1505.   #else
  1506.                   (char_u *)NULL, PV_NONE,
  1507.   #endif
  1508. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  1509.       {"cinwords",    "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  1510.   #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
  1511.                   (char_u *)&p_cinw, PV_CINW,
  1512. ***************
  1513. *** 729,735 ****
  1514.                   (char_u *)NULL, PV_NONE,
  1515.                   {(char_u *)0L, (char_u *)0L}
  1516.   #endif
  1517. !                 },
  1518.       {"clipboard",   "cb",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  1519.   #ifdef FEAT_CLIPBOARD
  1520.                   (char_u *)&p_cb, PV_NONE,
  1521. --- 732,738 ----
  1522.                   (char_u *)NULL, PV_NONE,
  1523.                   {(char_u *)0L, (char_u *)0L}
  1524.   #endif
  1525. !                 SCRIPTID_INIT},
  1526.       {"clipboard",   "cb",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  1527.   #ifdef FEAT_CLIPBOARD
  1528.                   (char_u *)&p_cb, PV_NONE,
  1529. ***************
  1530. *** 743,762 ****
  1531.                   (char_u *)NULL, PV_NONE,
  1532.                   {(char_u *)"", (char_u *)0L}
  1533.   #endif
  1534. !                 },
  1535.       {"cmdheight",   "ch",   P_NUM|P_VI_DEF|P_RALL,
  1536.                   (char_u *)&p_ch, PV_NONE,
  1537. !                 {(char_u *)1L, (char_u *)0L}},
  1538.       {"cmdwinheight", "cwh", P_NUM|P_VI_DEF,
  1539.   #ifdef FEAT_CMDWIN
  1540.                   (char_u *)&p_cwh, PV_NONE,
  1541.   #else
  1542.                   (char_u *)NULL, PV_NONE,
  1543.   #endif
  1544. !                 {(char_u *)7L, (char_u *)0L}},
  1545.       {"columns",        "co",   P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
  1546.                   (char_u *)&Columns, PV_NONE,
  1547. !                 {(char_u *)80L, (char_u *)0L}},
  1548.       {"comments",    "com",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  1549.   #ifdef FEAT_COMMENTS
  1550.                   (char_u *)&p_com, PV_COM,
  1551. --- 746,765 ----
  1552.                   (char_u *)NULL, PV_NONE,
  1553.                   {(char_u *)"", (char_u *)0L}
  1554.   #endif
  1555. !                 SCRIPTID_INIT},
  1556.       {"cmdheight",   "ch",   P_NUM|P_VI_DEF|P_RALL,
  1557.                   (char_u *)&p_ch, PV_NONE,
  1558. !                 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
  1559.       {"cmdwinheight", "cwh", P_NUM|P_VI_DEF,
  1560.   #ifdef FEAT_CMDWIN
  1561.                   (char_u *)&p_cwh, PV_NONE,
  1562.   #else
  1563.                   (char_u *)NULL, PV_NONE,
  1564.   #endif
  1565. !                 {(char_u *)7L, (char_u *)0L} SCRIPTID_INIT},
  1566.       {"columns",        "co",   P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
  1567.                   (char_u *)&Columns, PV_NONE,
  1568. !                 {(char_u *)80L, (char_u *)0L} SCRIPTID_INIT},
  1569.       {"comments",    "com",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  1570.   #ifdef FEAT_COMMENTS
  1571.                   (char_u *)&p_com, PV_COM,
  1572. ***************
  1573. *** 766,772 ****
  1574.                   (char_u *)NULL, PV_NONE,
  1575.                   {(char_u *)0L, (char_u *)0L}
  1576.   #endif
  1577. !                 },
  1578.       {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF,
  1579.   #ifdef FEAT_FOLDING
  1580.                   (char_u *)&p_cms, PV_CMS,
  1581. --- 769,775 ----
  1582.                   (char_u *)NULL, PV_NONE,
  1583.                   {(char_u *)0L, (char_u *)0L}
  1584.   #endif
  1585. !                 SCRIPTID_INIT},
  1586.       {"commentstring", "cms", P_STRING|P_ALLOCED|P_VI_DEF,
  1587.   #ifdef FEAT_FOLDING
  1588.                   (char_u *)&p_cms, PV_CMS,
  1589. ***************
  1590. *** 775,786 ****
  1591.                   (char_u *)NULL, PV_NONE,
  1592.                   {(char_u *)0L, (char_u *)0L}
  1593.   #endif
  1594. !                 },
  1595.                   /* P_PRI_MKRC isn't needed here, optval_default()
  1596.                    * always returns TRUE for 'compatible' */
  1597.       {"compatible",  "cp",   P_BOOL|P_RALL,
  1598.                   (char_u *)&p_cp, PV_NONE,
  1599. !                 {(char_u *)TRUE, (char_u *)FALSE}},
  1600.       {"complete",    "cpt",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  1601.   #ifdef FEAT_INS_EXPAND
  1602.                   (char_u *)&p_cpt, PV_CPT,
  1603. --- 778,789 ----
  1604.                   (char_u *)NULL, PV_NONE,
  1605.                   {(char_u *)0L, (char_u *)0L}
  1606.   #endif
  1607. !                 SCRIPTID_INIT},
  1608.                   /* P_PRI_MKRC isn't needed here, optval_default()
  1609.                    * always returns TRUE for 'compatible' */
  1610.       {"compatible",  "cp",   P_BOOL|P_RALL,
  1611.                   (char_u *)&p_cp, PV_NONE,
  1612. !                 {(char_u *)TRUE, (char_u *)FALSE} SCRIPTID_INIT},
  1613.       {"complete",    "cpt",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  1614.   #ifdef FEAT_INS_EXPAND
  1615.                   (char_u *)&p_cpt, PV_CPT,
  1616. ***************
  1617. *** 789,795 ****
  1618.                   (char_u *)NULL, PV_NONE,
  1619.                   {(char_u *)0L, (char_u *)0L}
  1620.   #endif
  1621. !                 },
  1622.       {"completefunc", "cfu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE,
  1623.   #ifdef FEAT_COMPL_FUNC
  1624.                   (char_u *)&p_cfu, PV_CFU,
  1625. --- 792,798 ----
  1626.                   (char_u *)NULL, PV_NONE,
  1627.                   {(char_u *)0L, (char_u *)0L}
  1628.   #endif
  1629. !                 SCRIPTID_INIT},
  1630.       {"completefunc", "cfu", P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE,
  1631.   #ifdef FEAT_COMPL_FUNC
  1632.                   (char_u *)&p_cfu, PV_CFU,
  1633. ***************
  1634. *** 798,804 ****
  1635.                   (char_u *)NULL, PV_NONE,
  1636.                   {(char_u *)0L, (char_u *)0L}
  1637.   #endif
  1638. !                 },
  1639.       {"completeopt",   "cot",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  1640.   #ifdef FEAT_INS_EXPAND
  1641.                   (char_u *)&p_cot, PV_NONE,
  1642. --- 801,807 ----
  1643.                   (char_u *)NULL, PV_NONE,
  1644.                   {(char_u *)0L, (char_u *)0L}
  1645.   #endif
  1646. !                 SCRIPTID_INIT},
  1647.       {"completeopt",   "cot",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  1648.   #ifdef FEAT_INS_EXPAND
  1649.                   (char_u *)&p_cot, PV_NONE,
  1650. ***************
  1651. *** 807,840 ****
  1652.                   (char_u *)NULL, PV_NONE,
  1653.                   {(char_u *)0L, (char_u *)0L}
  1654.   #endif
  1655. !                 },
  1656.       {"confirm",     "cf",   P_BOOL|P_VI_DEF,
  1657.   #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
  1658.                   (char_u *)&p_confirm, PV_NONE,
  1659.   #else
  1660.                   (char_u *)NULL, PV_NONE,
  1661.   #endif
  1662. !                 {(char_u *)FALSE, (char_u *)0L}},
  1663.       {"conskey",        "consk",P_BOOL|P_VI_DEF,
  1664.   #ifdef MSDOS
  1665.                   (char_u *)&p_consk, PV_NONE,
  1666.   #else
  1667.                   (char_u *)NULL, PV_NONE,
  1668.   #endif
  1669. !                 {(char_u *)FALSE, (char_u *)0L}},
  1670.       {"copyindent",  "ci",   P_BOOL|P_VI_DEF|P_VIM,
  1671.                   (char_u *)&p_ci, PV_CI,
  1672. !                 {(char_u *)FALSE, (char_u *)0L}},
  1673.       {"cpoptions",   "cpo",  P_STRING|P_VIM|P_RALL|P_FLAGLIST,
  1674.                   (char_u *)&p_cpo, PV_NONE,
  1675. !                 {(char_u *)CPO_VI, (char_u *)CPO_VIM}},
  1676.       {"cscopepathcomp", "cspc", P_NUM|P_VI_DEF|P_VIM,
  1677.   #ifdef FEAT_CSCOPE
  1678.                   (char_u *)&p_cspc, PV_NONE,
  1679.   #else
  1680.                   (char_u *)NULL, PV_NONE,
  1681.   #endif
  1682. !                 {(char_u *)0L, (char_u *)0L}},
  1683.       {"cscopeprg",   "csprg", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  1684.   #ifdef FEAT_CSCOPE
  1685.                   (char_u *)&p_csprg, PV_NONE,
  1686. --- 810,844 ----
  1687.                   (char_u *)NULL, PV_NONE,
  1688.                   {(char_u *)0L, (char_u *)0L}
  1689.   #endif
  1690. !                 SCRIPTID_INIT},
  1691.       {"confirm",     "cf",   P_BOOL|P_VI_DEF,
  1692.   #if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG)
  1693.                   (char_u *)&p_confirm, PV_NONE,
  1694.   #else
  1695.                   (char_u *)NULL, PV_NONE,
  1696.   #endif
  1697. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1698.       {"conskey",        "consk",P_BOOL|P_VI_DEF,
  1699.   #ifdef MSDOS
  1700.                   (char_u *)&p_consk, PV_NONE,
  1701.   #else
  1702.                   (char_u *)NULL, PV_NONE,
  1703.   #endif
  1704. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1705.       {"copyindent",  "ci",   P_BOOL|P_VI_DEF|P_VIM,
  1706.                   (char_u *)&p_ci, PV_CI,
  1707. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1708.       {"cpoptions",   "cpo",  P_STRING|P_VIM|P_RALL|P_FLAGLIST,
  1709.                   (char_u *)&p_cpo, PV_NONE,
  1710. !                 {(char_u *)CPO_VI, (char_u *)CPO_VIM}
  1711. !                 SCRIPTID_INIT},
  1712.       {"cscopepathcomp", "cspc", P_NUM|P_VI_DEF|P_VIM,
  1713.   #ifdef FEAT_CSCOPE
  1714.                   (char_u *)&p_cspc, PV_NONE,
  1715.   #else
  1716.                   (char_u *)NULL, PV_NONE,
  1717.   #endif
  1718. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  1719.       {"cscopeprg",   "csprg", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  1720.   #ifdef FEAT_CSCOPE
  1721.                   (char_u *)&p_csprg, PV_NONE,
  1722. ***************
  1723. *** 843,849 ****
  1724.                   (char_u *)NULL, PV_NONE,
  1725.                   {(char_u *)0L, (char_u *)0L}
  1726.   #endif
  1727. !                 },
  1728.       {"cscopequickfix", "csqf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  1729.   #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX)
  1730.                   (char_u *)&p_csqf, PV_NONE,
  1731. --- 847,853 ----
  1732.                   (char_u *)NULL, PV_NONE,
  1733.                   {(char_u *)0L, (char_u *)0L}
  1734.   #endif
  1735. !                 SCRIPTID_INIT},
  1736.       {"cscopequickfix", "csqf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  1737.   #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX)
  1738.                   (char_u *)&p_csqf, PV_NONE,
  1739. ***************
  1740. *** 852,896 ****
  1741.                   (char_u *)NULL, PV_NONE,
  1742.                   {(char_u *)0L, (char_u *)0L}
  1743.   #endif
  1744. !                 },
  1745.       {"cscopetag",   "cst",  P_BOOL|P_VI_DEF|P_VIM,
  1746.   #ifdef FEAT_CSCOPE
  1747.                   (char_u *)&p_cst, PV_NONE,
  1748.   #else
  1749.                   (char_u *)NULL, PV_NONE,
  1750.   #endif
  1751. !                 {(char_u *)0L, (char_u *)0L}},
  1752.       {"cscopetagorder", "csto", P_NUM|P_VI_DEF|P_VIM,
  1753.   #ifdef FEAT_CSCOPE
  1754.                   (char_u *)&p_csto, PV_NONE,
  1755.   #else
  1756.                   (char_u *)NULL, PV_NONE,
  1757.   #endif
  1758. !                 {(char_u *)0L, (char_u *)0L}},
  1759.       {"cscopeverbose", "csverb", P_BOOL|P_VI_DEF|P_VIM,
  1760.   #ifdef FEAT_CSCOPE
  1761.                   (char_u *)&p_csverbose, PV_NONE,
  1762.   #else
  1763.                   (char_u *)NULL, PV_NONE,
  1764.   #endif
  1765. !                 {(char_u *)0L, (char_u *)0L}},
  1766.       {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWIN,
  1767.   #ifdef FEAT_SYN_HL
  1768.                   (char_u *)VAR_WIN, PV_CUC,
  1769.   #else
  1770.                   (char_u *)NULL, PV_NONE,
  1771.   #endif
  1772. !                 {(char_u *)FALSE, (char_u *)0L}},
  1773.       {"cursorline",   "cul", P_BOOL|P_VI_DEF|P_RWIN,
  1774.   #ifdef FEAT_SYN_HL
  1775.                   (char_u *)VAR_WIN, PV_CUL,
  1776.   #else
  1777.                   (char_u *)NULL, PV_NONE,
  1778.   #endif
  1779. !                 {(char_u *)FALSE, (char_u *)0L}},
  1780.       {"debug",        NULL,   P_STRING|P_VI_DEF,
  1781.                   (char_u *)&p_debug, PV_NONE,
  1782. !                 {(char_u *)"", (char_u *)0L}},
  1783.       {"define",        "def",  P_STRING|P_ALLOCED|P_VI_DEF,
  1784.   #ifdef FEAT_FIND_ID
  1785.                   (char_u *)&p_def, PV_DEF,
  1786. --- 856,900 ----
  1787.                   (char_u *)NULL, PV_NONE,
  1788.                   {(char_u *)0L, (char_u *)0L}
  1789.   #endif
  1790. !                 SCRIPTID_INIT},
  1791.       {"cscopetag",   "cst",  P_BOOL|P_VI_DEF|P_VIM,
  1792.   #ifdef FEAT_CSCOPE
  1793.                   (char_u *)&p_cst, PV_NONE,
  1794.   #else
  1795.                   (char_u *)NULL, PV_NONE,
  1796.   #endif
  1797. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  1798.       {"cscopetagorder", "csto", P_NUM|P_VI_DEF|P_VIM,
  1799.   #ifdef FEAT_CSCOPE
  1800.                   (char_u *)&p_csto, PV_NONE,
  1801.   #else
  1802.                   (char_u *)NULL, PV_NONE,
  1803.   #endif
  1804. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  1805.       {"cscopeverbose", "csverb", P_BOOL|P_VI_DEF|P_VIM,
  1806.   #ifdef FEAT_CSCOPE
  1807.                   (char_u *)&p_csverbose, PV_NONE,
  1808.   #else
  1809.                   (char_u *)NULL, PV_NONE,
  1810.   #endif
  1811. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  1812.       {"cursorcolumn", "cuc", P_BOOL|P_VI_DEF|P_RWIN,
  1813.   #ifdef FEAT_SYN_HL
  1814.                   (char_u *)VAR_WIN, PV_CUC,
  1815.   #else
  1816.                   (char_u *)NULL, PV_NONE,
  1817.   #endif
  1818. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1819.       {"cursorline",   "cul", P_BOOL|P_VI_DEF|P_RWIN,
  1820.   #ifdef FEAT_SYN_HL
  1821.                   (char_u *)VAR_WIN, PV_CUL,
  1822.   #else
  1823.                   (char_u *)NULL, PV_NONE,
  1824.   #endif
  1825. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1826.       {"debug",        NULL,   P_STRING|P_VI_DEF,
  1827.                   (char_u *)&p_debug, PV_NONE,
  1828. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  1829.       {"define",        "def",  P_STRING|P_ALLOCED|P_VI_DEF,
  1830.   #ifdef FEAT_FIND_ID
  1831.                   (char_u *)&p_def, PV_DEF,
  1832. ***************
  1833. *** 899,926 ****
  1834.                   (char_u *)NULL, PV_NONE,
  1835.                   {(char_u *)NULL, (char_u *)0L}
  1836.   #endif
  1837. !                 },
  1838.       {"delcombine", "deco",  P_BOOL|P_VI_DEF|P_VIM,
  1839.   #ifdef FEAT_MBYTE
  1840.                   (char_u *)&p_deco, PV_NONE,
  1841.   #else
  1842.                   (char_u *)NULL, PV_NONE,
  1843.   #endif
  1844. !                 {(char_u *)FALSE, (char_u *)0L}},
  1845.       {"dictionary",  "dict", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
  1846.   #ifdef FEAT_INS_EXPAND
  1847.                   (char_u *)&p_dict, PV_DICT,
  1848.   #else
  1849.                   (char_u *)NULL, PV_NONE,
  1850.   #endif
  1851. !                 {(char_u *)"", (char_u *)0L}},
  1852.       {"diff",        NULL,   P_BOOL|P_VI_DEF|P_RWIN|P_NOGLOB,
  1853.   #ifdef FEAT_DIFF
  1854.                   (char_u *)VAR_WIN, PV_DIFF,
  1855.   #else
  1856.                   (char_u *)NULL, PV_NONE,
  1857.   #endif
  1858. !                 {(char_u *)FALSE, (char_u *)0L}},
  1859.       {"diffexpr",    "dex",  P_STRING|P_VI_DEF|P_SECURE,
  1860.   #if defined(FEAT_DIFF) && defined(FEAT_EVAL)
  1861.                   (char_u *)&p_dex, PV_NONE,
  1862. --- 903,930 ----
  1863.                   (char_u *)NULL, PV_NONE,
  1864.                   {(char_u *)NULL, (char_u *)0L}
  1865.   #endif
  1866. !                 SCRIPTID_INIT},
  1867.       {"delcombine", "deco",  P_BOOL|P_VI_DEF|P_VIM,
  1868.   #ifdef FEAT_MBYTE
  1869.                   (char_u *)&p_deco, PV_NONE,
  1870.   #else
  1871.                   (char_u *)NULL, PV_NONE,
  1872.   #endif
  1873. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1874.       {"dictionary",  "dict", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
  1875.   #ifdef FEAT_INS_EXPAND
  1876.                   (char_u *)&p_dict, PV_DICT,
  1877.   #else
  1878.                   (char_u *)NULL, PV_NONE,
  1879.   #endif
  1880. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  1881.       {"diff",        NULL,   P_BOOL|P_VI_DEF|P_RWIN|P_NOGLOB,
  1882.   #ifdef FEAT_DIFF
  1883.                   (char_u *)VAR_WIN, PV_DIFF,
  1884.   #else
  1885.                   (char_u *)NULL, PV_NONE,
  1886.   #endif
  1887. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1888.       {"diffexpr",    "dex",  P_STRING|P_VI_DEF|P_SECURE,
  1889.   #if defined(FEAT_DIFF) && defined(FEAT_EVAL)
  1890.                   (char_u *)&p_dex, PV_NONE,
  1891. ***************
  1892. *** 929,935 ****
  1893.                   (char_u *)NULL, PV_NONE,
  1894.                   {(char_u *)0L, (char_u *)0L}
  1895.   #endif
  1896. !                 },
  1897.       {"diffopt",        "dip",  P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_COMMA|P_NODUP,
  1898.   #ifdef FEAT_DIFF
  1899.                   (char_u *)&p_dip, PV_NONE,
  1900. --- 933,939 ----
  1901.                   (char_u *)NULL, PV_NONE,
  1902.                   {(char_u *)0L, (char_u *)0L}
  1903.   #endif
  1904. !                 SCRIPTID_INIT},
  1905.       {"diffopt",        "dip",  P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_COMMA|P_NODUP,
  1906.   #ifdef FEAT_DIFF
  1907.                   (char_u *)&p_dip, PV_NONE,
  1908. ***************
  1909. *** 938,957 ****
  1910.                   (char_u *)NULL, PV_NONE,
  1911.                   {(char_u *)"", (char_u *)NULL}
  1912.   #endif
  1913. !                 },
  1914.       {"digraph",        "dg",   P_BOOL|P_VI_DEF|P_VIM,
  1915.   #ifdef FEAT_DIGRAPHS
  1916.                   (char_u *)&p_dg, PV_NONE,
  1917.   #else
  1918.                   (char_u *)NULL, PV_NONE,
  1919.   #endif
  1920. !                 {(char_u *)FALSE, (char_u *)0L}},
  1921.       {"directory",   "dir",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
  1922.                   (char_u *)&p_dir, PV_NONE,
  1923. !                 {(char_u *)DFLT_DIR, (char_u *)0L}},
  1924.       {"display",        "dy",   P_STRING|P_VI_DEF|P_COMMA|P_RALL|P_NODUP,
  1925.                   (char_u *)&p_dy, PV_NONE,
  1926. !                 {(char_u *)"", (char_u *)0L}},
  1927.       {"eadirection", "ead",  P_STRING|P_VI_DEF,
  1928.   #ifdef FEAT_VERTSPLIT
  1929.                   (char_u *)&p_ead, PV_NONE,
  1930. --- 942,961 ----
  1931.                   (char_u *)NULL, PV_NONE,
  1932.                   {(char_u *)"", (char_u *)NULL}
  1933.   #endif
  1934. !                 SCRIPTID_INIT},
  1935.       {"digraph",        "dg",   P_BOOL|P_VI_DEF|P_VIM,
  1936.   #ifdef FEAT_DIGRAPHS
  1937.                   (char_u *)&p_dg, PV_NONE,
  1938.   #else
  1939.                   (char_u *)NULL, PV_NONE,
  1940.   #endif
  1941. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1942.       {"directory",   "dir",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
  1943.                   (char_u *)&p_dir, PV_NONE,
  1944. !                 {(char_u *)DFLT_DIR, (char_u *)0L} SCRIPTID_INIT},
  1945.       {"display",        "dy",   P_STRING|P_VI_DEF|P_COMMA|P_RALL|P_NODUP,
  1946.                   (char_u *)&p_dy, PV_NONE,
  1947. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  1948.       {"eadirection", "ead",  P_STRING|P_VI_DEF,
  1949.   #ifdef FEAT_VERTSPLIT
  1950.                   (char_u *)&p_ead, PV_NONE,
  1951. ***************
  1952. *** 960,969 ****
  1953.                   (char_u *)NULL, PV_NONE,
  1954.                   {(char_u *)NULL, (char_u *)0L}
  1955.   #endif
  1956. !                 },
  1957.       {"edcompatible","ed",   P_BOOL|P_VI_DEF,
  1958.                   (char_u *)&p_ed, PV_NONE,
  1959. !                 {(char_u *)FALSE, (char_u *)0L}},
  1960.       {"encoding",    "enc",  P_STRING|P_VI_DEF|P_RCLR,
  1961.   #ifdef FEAT_MBYTE
  1962.                   (char_u *)&p_enc, PV_NONE,
  1963. --- 964,973 ----
  1964.                   (char_u *)NULL, PV_NONE,
  1965.                   {(char_u *)NULL, (char_u *)0L}
  1966.   #endif
  1967. !                 SCRIPTID_INIT},
  1968.       {"edcompatible","ed",   P_BOOL|P_VI_DEF,
  1969.                   (char_u *)&p_ed, PV_NONE,
  1970. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  1971.       {"encoding",    "enc",  P_STRING|P_VI_DEF|P_RCLR,
  1972.   #ifdef FEAT_MBYTE
  1973.                   (char_u *)&p_enc, PV_NONE,
  1974. ***************
  1975. *** 972,990 ****
  1976.                   (char_u *)NULL, PV_NONE,
  1977.                   {(char_u *)0L, (char_u *)0L}
  1978.   #endif
  1979. !                 },
  1980.       {"endofline",   "eol",  P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
  1981.                   (char_u *)&p_eol, PV_EOL,
  1982. !                 {(char_u *)TRUE, (char_u *)0L}},
  1983.       {"equalalways", "ea",   P_BOOL|P_VI_DEF|P_RALL,
  1984.                   (char_u *)&p_ea, PV_NONE,
  1985. !                 {(char_u *)TRUE, (char_u *)0L}},
  1986.       {"equalprg",    "ep",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  1987.                   (char_u *)&p_ep, PV_EP,
  1988. !                 {(char_u *)"", (char_u *)0L}},
  1989.       {"errorbells",  "eb",   P_BOOL|P_VI_DEF,
  1990.                   (char_u *)&p_eb, PV_NONE,
  1991. !                 {(char_u *)FALSE, (char_u *)0L}},
  1992.       {"errorfile",   "ef",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  1993.   #ifdef FEAT_QUICKFIX
  1994.                   (char_u *)&p_ef, PV_NONE,
  1995. --- 976,994 ----
  1996.                   (char_u *)NULL, PV_NONE,
  1997.                   {(char_u *)0L, (char_u *)0L}
  1998.   #endif
  1999. !                 SCRIPTID_INIT},
  2000.       {"endofline",   "eol",  P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
  2001.                   (char_u *)&p_eol, PV_EOL,
  2002. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  2003.       {"equalalways", "ea",   P_BOOL|P_VI_DEF|P_RALL,
  2004.                   (char_u *)&p_ea, PV_NONE,
  2005. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  2006.       {"equalprg",    "ep",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  2007.                   (char_u *)&p_ep, PV_EP,
  2008. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  2009.       {"errorbells",  "eb",   P_BOOL|P_VI_DEF,
  2010.                   (char_u *)&p_eb, PV_NONE,
  2011. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2012.       {"errorfile",   "ef",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  2013.   #ifdef FEAT_QUICKFIX
  2014.                   (char_u *)&p_ef, PV_NONE,
  2015. ***************
  2016. *** 993,1024 ****
  2017.                   (char_u *)NULL, PV_NONE,
  2018.                   {(char_u *)NULL, (char_u *)0L}
  2019.   #endif
  2020. !                 },
  2021.       {"errorformat", "efm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2022.   #ifdef FEAT_QUICKFIX
  2023.                   (char_u *)&p_efm, PV_EFM,
  2024. !                 {(char_u *)DFLT_EFM, (char_u *)0L},
  2025.   #else
  2026.                   (char_u *)NULL, PV_NONE,
  2027.                   {(char_u *)NULL, (char_u *)0L}
  2028.   #endif
  2029. !                 },
  2030.       {"esckeys",        "ek",   P_BOOL|P_VIM,
  2031.                   (char_u *)&p_ek, PV_NONE,
  2032. !                 {(char_u *)FALSE, (char_u *)TRUE}},
  2033.       {"eventignore", "ei",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2034.   #ifdef FEAT_AUTOCMD
  2035.                   (char_u *)&p_ei, PV_NONE,
  2036.   #else
  2037.                   (char_u *)NULL, PV_NONE,
  2038.   #endif
  2039. !                 {(char_u *)"", (char_u *)0L}},
  2040.       {"expandtab",   "et",   P_BOOL|P_VI_DEF|P_VIM,
  2041.                   (char_u *)&p_et, PV_ET,
  2042. !                 {(char_u *)FALSE, (char_u *)0L}},
  2043.       {"exrc",        "ex",   P_BOOL|P_VI_DEF|P_SECURE,
  2044.                   (char_u *)&p_exrc, PV_NONE,
  2045. !                 {(char_u *)FALSE, (char_u *)0L}},
  2046.       {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF|P_NO_MKRC,
  2047.   #ifdef FEAT_MBYTE
  2048.                   (char_u *)&p_fenc, PV_FENC,
  2049. --- 997,1028 ----
  2050.                   (char_u *)NULL, PV_NONE,
  2051.                   {(char_u *)NULL, (char_u *)0L}
  2052.   #endif
  2053. !                 SCRIPTID_INIT},
  2054.       {"errorformat", "efm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2055.   #ifdef FEAT_QUICKFIX
  2056.                   (char_u *)&p_efm, PV_EFM,
  2057. !                 {(char_u *)DFLT_EFM, (char_u *)0L}
  2058.   #else
  2059.                   (char_u *)NULL, PV_NONE,
  2060.                   {(char_u *)NULL, (char_u *)0L}
  2061.   #endif
  2062. !                 SCRIPTID_INIT},
  2063.       {"esckeys",        "ek",   P_BOOL|P_VIM,
  2064.                   (char_u *)&p_ek, PV_NONE,
  2065. !                 {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
  2066.       {"eventignore", "ei",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2067.   #ifdef FEAT_AUTOCMD
  2068.                   (char_u *)&p_ei, PV_NONE,
  2069.   #else
  2070.                   (char_u *)NULL, PV_NONE,
  2071.   #endif
  2072. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  2073.       {"expandtab",   "et",   P_BOOL|P_VI_DEF|P_VIM,
  2074.                   (char_u *)&p_et, PV_ET,
  2075. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2076.       {"exrc",        "ex",   P_BOOL|P_VI_DEF|P_SECURE,
  2077.                   (char_u *)&p_exrc, PV_NONE,
  2078. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2079.       {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF|P_NO_MKRC,
  2080.   #ifdef FEAT_MBYTE
  2081.                   (char_u *)&p_fenc, PV_FENC,
  2082. ***************
  2083. *** 1027,1033 ****
  2084.                   (char_u *)NULL, PV_NONE,
  2085.                   {(char_u *)0L, (char_u *)0L}
  2086.   #endif
  2087. !                 },
  2088.       {"fileencodings","fencs", P_STRING|P_VI_DEF|P_COMMA,
  2089.   #ifdef FEAT_MBYTE
  2090.                   (char_u *)&p_fencs, PV_NONE,
  2091. --- 1031,1037 ----
  2092.                   (char_u *)NULL, PV_NONE,
  2093.                   {(char_u *)0L, (char_u *)0L}
  2094.   #endif
  2095. !                 SCRIPTID_INIT},
  2096.       {"fileencodings","fencs", P_STRING|P_VI_DEF|P_COMMA,
  2097.   #ifdef FEAT_MBYTE
  2098.                   (char_u *)&p_fencs, PV_NONE,
  2099. ***************
  2100. *** 1036,1048 ****
  2101.                   (char_u *)NULL, PV_NONE,
  2102.                   {(char_u *)0L, (char_u *)0L}
  2103.   #endif
  2104. !                 },
  2105.       {"fileformat",  "ff",   P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC,
  2106.                   (char_u *)&p_ff, PV_FF,
  2107. !                 {(char_u *)DFLT_FF, (char_u *)0L}},
  2108.       {"fileformats", "ffs",  P_STRING|P_VIM|P_COMMA|P_NODUP,
  2109.                   (char_u *)&p_ffs, PV_NONE,
  2110. !                 {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}},
  2111.       {"filetype",    "ft",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
  2112.   #ifdef FEAT_AUTOCMD
  2113.                   (char_u *)&p_ft, PV_FT,
  2114. --- 1040,1053 ----
  2115.                   (char_u *)NULL, PV_NONE,
  2116.                   {(char_u *)0L, (char_u *)0L}
  2117.   #endif
  2118. !                 SCRIPTID_INIT},
  2119.       {"fileformat",  "ff",   P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC,
  2120.                   (char_u *)&p_ff, PV_FF,
  2121. !                 {(char_u *)DFLT_FF, (char_u *)0L} SCRIPTID_INIT},
  2122.       {"fileformats", "ffs",  P_STRING|P_VIM|P_COMMA|P_NODUP,
  2123.                   (char_u *)&p_ffs, PV_NONE,
  2124. !                 {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}
  2125. !                 SCRIPTID_INIT},
  2126.       {"filetype",    "ft",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
  2127.   #ifdef FEAT_AUTOCMD
  2128.                   (char_u *)&p_ft, PV_FT,
  2129. ***************
  2130. *** 1051,1057 ****
  2131.                   (char_u *)NULL, PV_NONE,
  2132.                   {(char_u *)0L, (char_u *)0L}
  2133.   #endif
  2134. !                 },
  2135.       {"fillchars",   "fcs",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
  2136.   #if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING)
  2137.                   (char_u *)&p_fcs, PV_NONE,
  2138. --- 1056,1062 ----
  2139.                   (char_u *)NULL, PV_NONE,
  2140.                   {(char_u *)0L, (char_u *)0L}
  2141.   #endif
  2142. !                 SCRIPTID_INIT},
  2143.       {"fillchars",   "fcs",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
  2144.   #if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING)
  2145.                   (char_u *)&p_fcs, PV_NONE,
  2146. ***************
  2147. *** 1060,1086 ****
  2148.                   (char_u *)NULL, PV_NONE,
  2149.                   {(char_u *)"", (char_u *)0L}
  2150.   #endif
  2151. !                 },
  2152.       {"fkmap",        "fk",   P_BOOL|P_VI_DEF,
  2153.   #ifdef FEAT_FKMAP
  2154.                   (char_u *)&p_fkmap, PV_NONE,
  2155.   #else
  2156.                   (char_u *)NULL, PV_NONE,
  2157.   #endif
  2158. !                 {(char_u *)FALSE, (char_u *)0L}},
  2159.       {"flash",        "fl",   P_BOOL|P_VI_DEF,
  2160.                   (char_u *)NULL, PV_NONE,
  2161. !                 {(char_u *)FALSE, (char_u *)0L}},
  2162.   #ifdef FEAT_FOLDING
  2163.       {"foldclose",   "fcl",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_RWIN,
  2164.                   (char_u *)&p_fcl, PV_NONE,
  2165. !                 {(char_u *)"", (char_u *)0L}},
  2166.       {"foldcolumn",  "fdc",  P_NUM|P_VI_DEF|P_RWIN,
  2167.                   (char_u *)VAR_WIN, PV_FDC,
  2168. !                 {(char_u *)FALSE, (char_u *)0L}},
  2169.       {"foldenable",  "fen",  P_BOOL|P_VI_DEF|P_RWIN,
  2170.                   (char_u *)VAR_WIN, PV_FEN,
  2171. !                 {(char_u *)TRUE, (char_u *)0L}},
  2172.       {"foldexpr",    "fde",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
  2173.   # ifdef FEAT_EVAL
  2174.                   (char_u *)VAR_WIN, PV_FDE,
  2175. --- 1065,1091 ----
  2176.                   (char_u *)NULL, PV_NONE,
  2177.                   {(char_u *)"", (char_u *)0L}
  2178.   #endif
  2179. !                 SCRIPTID_INIT},
  2180.       {"fkmap",        "fk",   P_BOOL|P_VI_DEF,
  2181.   #ifdef FEAT_FKMAP
  2182.                   (char_u *)&p_fkmap, PV_NONE,
  2183.   #else
  2184.                   (char_u *)NULL, PV_NONE,
  2185.   #endif
  2186. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2187.       {"flash",        "fl",   P_BOOL|P_VI_DEF,
  2188.                   (char_u *)NULL, PV_NONE,
  2189. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2190.   #ifdef FEAT_FOLDING
  2191.       {"foldclose",   "fcl",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_RWIN,
  2192.                   (char_u *)&p_fcl, PV_NONE,
  2193. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  2194.       {"foldcolumn",  "fdc",  P_NUM|P_VI_DEF|P_RWIN,
  2195.                   (char_u *)VAR_WIN, PV_FDC,
  2196. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2197.       {"foldenable",  "fen",  P_BOOL|P_VI_DEF|P_RWIN,
  2198.                   (char_u *)VAR_WIN, PV_FEN,
  2199. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  2200.       {"foldexpr",    "fde",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
  2201.   # ifdef FEAT_EVAL
  2202.                   (char_u *)VAR_WIN, PV_FDE,
  2203. ***************
  2204. *** 1089,1121 ****
  2205.                   (char_u *)NULL, PV_NONE,
  2206.                   {(char_u *)NULL, (char_u *)0L}
  2207.   # endif
  2208. !                 },
  2209.       {"foldignore",  "fdi",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
  2210.                   (char_u *)VAR_WIN, PV_FDI,
  2211. !                 {(char_u *)"#", (char_u *)NULL}},
  2212.       {"foldlevel",   "fdl",  P_NUM|P_VI_DEF|P_RWIN,
  2213.                   (char_u *)VAR_WIN, PV_FDL,
  2214. !                 {(char_u *)0L, (char_u *)0L}},
  2215.       {"foldlevelstart","fdls", P_NUM|P_VI_DEF,
  2216.                   (char_u *)&p_fdls, PV_NONE,
  2217. !                 {(char_u *)-1L, (char_u *)0L}},
  2218.       {"foldmarker",  "fmr",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|
  2219.                                  P_RWIN|P_COMMA|P_NODUP,
  2220.                   (char_u *)VAR_WIN, PV_FMR,
  2221. !                 {(char_u *)"{{{,}}}", (char_u *)NULL}},
  2222.       {"foldmethod",  "fdm",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
  2223.                   (char_u *)VAR_WIN, PV_FDM,
  2224. !                 {(char_u *)"manual", (char_u *)NULL}},
  2225.       {"foldminlines","fml",  P_NUM|P_VI_DEF|P_RWIN,
  2226.                   (char_u *)VAR_WIN, PV_FML,
  2227. !                 {(char_u *)1L, (char_u *)0L}},
  2228.       {"foldnestmax", "fdn",  P_NUM|P_VI_DEF|P_RWIN,
  2229.                   (char_u *)VAR_WIN, PV_FDN,
  2230. !                 {(char_u *)20L, (char_u *)0L}},
  2231.       {"foldopen",    "fdo",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2232.                   (char_u *)&p_fdo, PV_NONE,
  2233.            {(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo",
  2234. !                                    (char_u *)0L}},
  2235.       {"foldtext",    "fdt",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
  2236.   # ifdef FEAT_EVAL
  2237.                   (char_u *)VAR_WIN, PV_FDT,
  2238. --- 1094,1127 ----
  2239.                   (char_u *)NULL, PV_NONE,
  2240.                   {(char_u *)NULL, (char_u *)0L}
  2241.   # endif
  2242. !                 SCRIPTID_INIT},
  2243.       {"foldignore",  "fdi",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
  2244.                   (char_u *)VAR_WIN, PV_FDI,
  2245. !                 {(char_u *)"#", (char_u *)NULL} SCRIPTID_INIT},
  2246.       {"foldlevel",   "fdl",  P_NUM|P_VI_DEF|P_RWIN,
  2247.                   (char_u *)VAR_WIN, PV_FDL,
  2248. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  2249.       {"foldlevelstart","fdls", P_NUM|P_VI_DEF,
  2250.                   (char_u *)&p_fdls, PV_NONE,
  2251. !                 {(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT},
  2252.       {"foldmarker",  "fmr",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|
  2253.                                  P_RWIN|P_COMMA|P_NODUP,
  2254.                   (char_u *)VAR_WIN, PV_FMR,
  2255. !                 {(char_u *)"{{{,}}}", (char_u *)NULL}
  2256. !                 SCRIPTID_INIT},
  2257.       {"foldmethod",  "fdm",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
  2258.                   (char_u *)VAR_WIN, PV_FDM,
  2259. !                 {(char_u *)"manual", (char_u *)NULL} SCRIPTID_INIT},
  2260.       {"foldminlines","fml",  P_NUM|P_VI_DEF|P_RWIN,
  2261.                   (char_u *)VAR_WIN, PV_FML,
  2262. !                 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
  2263.       {"foldnestmax", "fdn",  P_NUM|P_VI_DEF|P_RWIN,
  2264.                   (char_u *)VAR_WIN, PV_FDN,
  2265. !                 {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
  2266.       {"foldopen",    "fdo",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2267.                   (char_u *)&p_fdo, PV_NONE,
  2268.            {(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo",
  2269. !                          (char_u *)0L} SCRIPTID_INIT},
  2270.       {"foldtext",    "fdt",  P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
  2271.   # ifdef FEAT_EVAL
  2272.                   (char_u *)VAR_WIN, PV_FDT,
  2273. ***************
  2274. *** 1124,1130 ****
  2275.                   (char_u *)NULL, PV_NONE,
  2276.                   {(char_u *)NULL, (char_u *)0L}
  2277.   # endif
  2278. !                 },
  2279.   #endif
  2280.       {"formatexpr", "fex",   P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
  2281.   #ifdef FEAT_EVAL
  2282. --- 1130,1136 ----
  2283.                   (char_u *)NULL, PV_NONE,
  2284.                   {(char_u *)NULL, (char_u *)0L}
  2285.   # endif
  2286. !                 SCRIPTID_INIT},
  2287.   #endif
  2288.       {"formatexpr", "fex",   P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
  2289.   #ifdef FEAT_EVAL
  2290. ***************
  2291. *** 1134,1149 ****
  2292.                   (char_u *)NULL, PV_NONE,
  2293.                   {(char_u *)0L, (char_u *)0L}
  2294.   #endif
  2295. !                 },
  2296.       {"formatoptions","fo",  P_STRING|P_ALLOCED|P_VIM|P_FLAGLIST,
  2297.                   (char_u *)&p_fo, PV_FO,
  2298. !                 {(char_u *)DFLT_FO_VI, (char_u *)DFLT_FO_VIM}},
  2299.       {"formatlistpat","flp", P_STRING|P_ALLOCED|P_VI_DEF,
  2300.                   (char_u *)&p_flp, PV_FLP,
  2301. !                 {(char_u *)"^\\s*\\d\\+[\\]:.)}\\t ]\\s*", (char_u *)0L}},
  2302.       {"formatprg",   "fp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  2303.                   (char_u *)&p_fp, PV_NONE,
  2304. !                 {(char_u *)"", (char_u *)0L}},
  2305.       {"fsync",       "fs",   P_BOOL|P_SECURE|P_VI_DEF,
  2306.   #ifdef HAVE_FSYNC
  2307.                   (char_u *)&p_fs, PV_NONE,
  2308. --- 1140,1157 ----
  2309.                   (char_u *)NULL, PV_NONE,
  2310.                   {(char_u *)0L, (char_u *)0L}
  2311.   #endif
  2312. !                 SCRIPTID_INIT},
  2313.       {"formatoptions","fo",  P_STRING|P_ALLOCED|P_VIM|P_FLAGLIST,
  2314.                   (char_u *)&p_fo, PV_FO,
  2315. !                 {(char_u *)DFLT_FO_VI, (char_u *)DFLT_FO_VIM}
  2316. !                 SCRIPTID_INIT},
  2317.       {"formatlistpat","flp", P_STRING|P_ALLOCED|P_VI_DEF,
  2318.                   (char_u *)&p_flp, PV_FLP,
  2319. !                 {(char_u *)"^\\s*\\d\\+[\\]:.)}\\t ]\\s*",
  2320. !                          (char_u *)0L} SCRIPTID_INIT},
  2321.       {"formatprg",   "fp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  2322.                   (char_u *)&p_fp, PV_NONE,
  2323. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  2324.       {"fsync",       "fs",   P_BOOL|P_SECURE|P_VI_DEF,
  2325.   #ifdef HAVE_FSYNC
  2326.                   (char_u *)&p_fs, PV_NONE,
  2327. ***************
  2328. *** 1152,1173 ****
  2329.                   (char_u *)NULL, PV_NONE,
  2330.                   {(char_u *)FALSE, (char_u *)0L}
  2331.   #endif
  2332. !                 },
  2333.       {"gdefault",    "gd",   P_BOOL|P_VI_DEF|P_VIM,
  2334.                   (char_u *)&p_gd, PV_NONE,
  2335. !                 {(char_u *)FALSE, (char_u *)0L}},
  2336.       {"graphic",        "gr",   P_BOOL|P_VI_DEF,
  2337.                   (char_u *)NULL, PV_NONE,
  2338. !                 {(char_u *)FALSE, (char_u *)0L}},
  2339.       {"grepformat",  "gfm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2340.   #ifdef FEAT_QUICKFIX
  2341.                   (char_u *)&p_gefm, PV_NONE,
  2342. !                 {(char_u *)DFLT_GREPFORMAT, (char_u *)0L},
  2343.   #else
  2344.                   (char_u *)NULL, PV_NONE,
  2345.                   {(char_u *)NULL, (char_u *)0L}
  2346.   #endif
  2347. !                 },
  2348.       {"grepprg",        "gp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  2349.   #ifdef FEAT_QUICKFIX
  2350.                   (char_u *)&p_gp, PV_GP,
  2351. --- 1160,1181 ----
  2352.                   (char_u *)NULL, PV_NONE,
  2353.                   {(char_u *)FALSE, (char_u *)0L}
  2354.   #endif
  2355. !                 SCRIPTID_INIT},
  2356.       {"gdefault",    "gd",   P_BOOL|P_VI_DEF|P_VIM,
  2357.                   (char_u *)&p_gd, PV_NONE,
  2358. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2359.       {"graphic",        "gr",   P_BOOL|P_VI_DEF,
  2360.                   (char_u *)NULL, PV_NONE,
  2361. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2362.       {"grepformat",  "gfm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2363.   #ifdef FEAT_QUICKFIX
  2364.                   (char_u *)&p_gefm, PV_NONE,
  2365. !                 {(char_u *)DFLT_GREPFORMAT, (char_u *)0L}
  2366.   #else
  2367.                   (char_u *)NULL, PV_NONE,
  2368.                   {(char_u *)NULL, (char_u *)0L}
  2369.   #endif
  2370. !                 SCRIPTID_INIT},
  2371.       {"grepprg",        "gp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  2372.   #ifdef FEAT_QUICKFIX
  2373.                   (char_u *)&p_gp, PV_GP,
  2374. ***************
  2375. *** 1185,1199 ****
  2376.                   (char_u *)"SEARCH/NUMBERS ",
  2377.   #   else
  2378.                   (char_u *)"grep -n ",
  2379. ! #endif
  2380. ! #endif
  2381.   # endif
  2382. !                 (char_u *)0L},
  2383.   #else
  2384.                   (char_u *)NULL, PV_NONE,
  2385.                   {(char_u *)NULL, (char_u *)0L}
  2386.   #endif
  2387. !                 },
  2388.       {"guicursor",    "gcr",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2389.   #ifdef CURSOR_SHAPE
  2390.                   (char_u *)&p_guicursor, PV_NONE,
  2391. --- 1193,1207 ----
  2392.                   (char_u *)"SEARCH/NUMBERS ",
  2393.   #   else
  2394.                   (char_u *)"grep -n ",
  2395. ! #   endif
  2396. ! #  endif
  2397.   # endif
  2398. !                 (char_u *)0L}
  2399.   #else
  2400.                   (char_u *)NULL, PV_NONE,
  2401.                   {(char_u *)NULL, (char_u *)0L}
  2402.   #endif
  2403. !                 SCRIPTID_INIT},
  2404.       {"guicursor",    "gcr",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2405.   #ifdef CURSOR_SHAPE
  2406.                   (char_u *)&p_guicursor, PV_NONE,
  2407. ***************
  2408. *** 1208,1214 ****
  2409.                   (char_u *)NULL, PV_NONE,
  2410.                   {(char_u *)NULL, (char_u *)0L}
  2411.   #endif
  2412. !                     },
  2413.       {"guifont",        "gfn",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
  2414.   #ifdef FEAT_GUI
  2415.                   (char_u *)&p_guifont, PV_NONE,
  2416. --- 1216,1222 ----
  2417.                   (char_u *)NULL, PV_NONE,
  2418.                   {(char_u *)NULL, (char_u *)0L}
  2419.   #endif
  2420. !                 SCRIPTID_INIT},
  2421.       {"guifont",        "gfn",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
  2422.   #ifdef FEAT_GUI
  2423.                   (char_u *)&p_guifont, PV_NONE,
  2424. ***************
  2425. *** 1217,1223 ****
  2426.                   (char_u *)NULL, PV_NONE,
  2427.                   {(char_u *)NULL, (char_u *)0L}
  2428.   #endif
  2429. !                     },
  2430.       {"guifontset",  "gfs",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA,
  2431.   #if defined(FEAT_GUI) && defined(FEAT_XFONTSET)
  2432.                   (char_u *)&p_guifontset, PV_NONE,
  2433. --- 1225,1231 ----
  2434.                   (char_u *)NULL, PV_NONE,
  2435.                   {(char_u *)NULL, (char_u *)0L}
  2436.   #endif
  2437. !                 SCRIPTID_INIT},
  2438.       {"guifontset",  "gfs",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA,
  2439.   #if defined(FEAT_GUI) && defined(FEAT_XFONTSET)
  2440.                   (char_u *)&p_guifontset, PV_NONE,
  2441. ***************
  2442. *** 1226,1232 ****
  2443.                   (char_u *)NULL, PV_NONE,
  2444.                   {(char_u *)NULL, (char_u *)0L}
  2445.   #endif
  2446. !                     },
  2447.       {"guifontwide", "gfw",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
  2448.   #if defined(FEAT_GUI) && defined(FEAT_MBYTE)
  2449.                   (char_u *)&p_guifontwide, PV_NONE,
  2450. --- 1234,1240 ----
  2451.                   (char_u *)NULL, PV_NONE,
  2452.                   {(char_u *)NULL, (char_u *)0L}
  2453.   #endif
  2454. !                 SCRIPTID_INIT},
  2455.       {"guifontwide", "gfw",  P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
  2456.   #if defined(FEAT_GUI) && defined(FEAT_MBYTE)
  2457.                   (char_u *)&p_guifontwide, PV_NONE,
  2458. ***************
  2459. *** 1235,1248 ****
  2460.                   (char_u *)NULL, PV_NONE,
  2461.                   {(char_u *)NULL, (char_u *)0L}
  2462.   #endif
  2463. !                     },
  2464.       {"guiheadroom", "ghr",  P_NUM|P_VI_DEF,
  2465.   #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11)
  2466.                   (char_u *)&p_ghr, PV_NONE,
  2467.   #else
  2468.                   (char_u *)NULL, PV_NONE,
  2469.   #endif
  2470. !                 {(char_u *)50L, (char_u *)0L}},
  2471.       {"guioptions",  "go",   P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST,
  2472.   #if defined(FEAT_GUI)
  2473.                   (char_u *)&p_go, PV_NONE,
  2474. --- 1243,1256 ----
  2475.                   (char_u *)NULL, PV_NONE,
  2476.                   {(char_u *)NULL, (char_u *)0L}
  2477.   #endif
  2478. !                 SCRIPTID_INIT},
  2479.       {"guiheadroom", "ghr",  P_NUM|P_VI_DEF,
  2480.   #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_X11)
  2481.                   (char_u *)&p_ghr, PV_NONE,
  2482.   #else
  2483.                   (char_u *)NULL, PV_NONE,
  2484.   #endif
  2485. !                 {(char_u *)50L, (char_u *)0L} SCRIPTID_INIT},
  2486.       {"guioptions",  "go",   P_STRING|P_VI_DEF|P_RALL|P_FLAGLIST,
  2487.   #if defined(FEAT_GUI)
  2488.                   (char_u *)&p_go, PV_NONE,
  2489. ***************
  2490. *** 1255,1268 ****
  2491.                   (char_u *)NULL, PV_NONE,
  2492.                   {(char_u *)NULL, (char_u *)0L}
  2493.   #endif
  2494. !                     },
  2495.       {"guipty",        NULL,   P_BOOL|P_VI_DEF,
  2496.   #if defined(FEAT_GUI)
  2497.                   (char_u *)&p_guipty, PV_NONE,
  2498.   #else
  2499.                   (char_u *)NULL, PV_NONE,
  2500.   #endif
  2501. !                 {(char_u *)TRUE, (char_u *)0L}},
  2502.       {"guitablabel",  "gtl", P_STRING|P_VI_DEF|P_RWIN,
  2503.   #if defined(FEAT_GUI_TABLINE)
  2504.                   (char_u *)&p_gtl, PV_NONE,
  2505. --- 1263,1276 ----
  2506.                   (char_u *)NULL, PV_NONE,
  2507.                   {(char_u *)NULL, (char_u *)0L}
  2508.   #endif
  2509. !                 SCRIPTID_INIT},
  2510.       {"guipty",        NULL,   P_BOOL|P_VI_DEF,
  2511.   #if defined(FEAT_GUI)
  2512.                   (char_u *)&p_guipty, PV_NONE,
  2513.   #else
  2514.                   (char_u *)NULL, PV_NONE,
  2515.   #endif
  2516. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  2517.       {"guitablabel",  "gtl", P_STRING|P_VI_DEF|P_RWIN,
  2518.   #if defined(FEAT_GUI_TABLINE)
  2519.                   (char_u *)&p_gtl, PV_NONE,
  2520. ***************
  2521. *** 1271,1277 ****
  2522.                   (char_u *)NULL, PV_NONE,
  2523.                   {(char_u *)NULL, (char_u *)0L}
  2524.   #endif
  2525. !                     },
  2526.       {"guitabtooltip",  "gtt", P_STRING|P_VI_DEF|P_RWIN,
  2527.   #if defined(FEAT_GUI_TABLINE)
  2528.                   (char_u *)&p_gtt, PV_NONE,
  2529. --- 1279,1285 ----
  2530.                   (char_u *)NULL, PV_NONE,
  2531.                   {(char_u *)NULL, (char_u *)0L}
  2532.   #endif
  2533. !                 SCRIPTID_INIT},
  2534.       {"guitabtooltip",  "gtt", P_STRING|P_VI_DEF|P_RWIN,
  2535.   #if defined(FEAT_GUI_TABLINE)
  2536.                   (char_u *)&p_gtt, PV_NONE,
  2537. ***************
  2538. *** 1280,1299 ****
  2539.                   (char_u *)NULL, PV_NONE,
  2540.                   {(char_u *)NULL, (char_u *)0L}
  2541.   #endif
  2542. !                     },
  2543.       {"hardtabs",    "ht",   P_NUM|P_VI_DEF,
  2544.                   (char_u *)NULL, PV_NONE,
  2545. !                 {(char_u *)0L, (char_u *)0L}},
  2546.       {"helpfile",    "hf",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  2547.                   (char_u *)&p_hf, PV_NONE,
  2548. !                 {(char_u *)DFLT_HELPFILE, (char_u *)0L}},
  2549.       {"helpheight",  "hh",   P_NUM|P_VI_DEF,
  2550.   #ifdef FEAT_WINDOWS
  2551.                   (char_u *)&p_hh, PV_NONE,
  2552.   #else
  2553.                   (char_u *)NULL, PV_NONE,
  2554.   #endif
  2555. !                 {(char_u *)20L, (char_u *)0L}},
  2556.       {"helplang",    "hlg",  P_STRING|P_VI_DEF|P_COMMA,
  2557.   #ifdef FEAT_MULTI_LANG
  2558.                   (char_u *)&p_hlg, PV_NONE,
  2559. --- 1288,1308 ----
  2560.                   (char_u *)NULL, PV_NONE,
  2561.                   {(char_u *)NULL, (char_u *)0L}
  2562.   #endif
  2563. !                 SCRIPTID_INIT},
  2564.       {"hardtabs",    "ht",   P_NUM|P_VI_DEF,
  2565.                   (char_u *)NULL, PV_NONE,
  2566. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  2567.       {"helpfile",    "hf",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  2568.                   (char_u *)&p_hf, PV_NONE,
  2569. !                 {(char_u *)DFLT_HELPFILE, (char_u *)0L}
  2570. !                 SCRIPTID_INIT},
  2571.       {"helpheight",  "hh",   P_NUM|P_VI_DEF,
  2572.   #ifdef FEAT_WINDOWS
  2573.                   (char_u *)&p_hh, PV_NONE,
  2574.   #else
  2575.                   (char_u *)NULL, PV_NONE,
  2576.   #endif
  2577. !                 {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
  2578.       {"helplang",    "hlg",  P_STRING|P_VI_DEF|P_COMMA,
  2579.   #ifdef FEAT_MULTI_LANG
  2580.                   (char_u *)&p_hlg, PV_NONE,
  2581. ***************
  2582. *** 1302,1365 ****
  2583.                   (char_u *)NULL, PV_NONE,
  2584.                   {(char_u *)0L, (char_u *)0L}
  2585.   #endif
  2586. !     },
  2587.       {"hidden",        "hid",  P_BOOL|P_VI_DEF,
  2588.                   (char_u *)&p_hid, PV_NONE,
  2589. !                 {(char_u *)FALSE, (char_u *)0L}},
  2590.       {"highlight",   "hl",   P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
  2591.                   (char_u *)&p_hl, PV_NONE,
  2592. !                 {(char_u *)HIGHLIGHT_INIT, (char_u *)0L}},
  2593.       {"history",        "hi",   P_NUM|P_VIM,
  2594.                   (char_u *)&p_hi, PV_NONE,
  2595. !                 {(char_u *)0L, (char_u *)20L}},
  2596.       {"hkmap",        "hk",   P_BOOL|P_VI_DEF|P_VIM,
  2597.   #ifdef FEAT_RIGHTLEFT
  2598.                   (char_u *)&p_hkmap, PV_NONE,
  2599.   #else
  2600.                   (char_u *)NULL, PV_NONE,
  2601.   #endif
  2602. !                 {(char_u *)FALSE, (char_u *)0L}},
  2603.       {"hkmapp",        "hkp",  P_BOOL|P_VI_DEF|P_VIM,
  2604.   #ifdef FEAT_RIGHTLEFT
  2605.                   (char_u *)&p_hkmapp, PV_NONE,
  2606.   #else
  2607.                   (char_u *)NULL, PV_NONE,
  2608.   #endif
  2609. !                 {(char_u *)FALSE, (char_u *)0L}},
  2610.       {"hlsearch",    "hls",  P_BOOL|P_VI_DEF|P_VIM|P_RALL,
  2611.                   (char_u *)&p_hls, PV_NONE,
  2612. !                 {(char_u *)FALSE, (char_u *)0L}},
  2613.       {"icon",        NULL,   P_BOOL|P_VI_DEF,
  2614.   #ifdef FEAT_TITLE
  2615.                   (char_u *)&p_icon, PV_NONE,
  2616.   #else
  2617.                   (char_u *)NULL, PV_NONE,
  2618.   #endif
  2619. !                 {(char_u *)FALSE, (char_u *)0L}},
  2620.       {"iconstring",  NULL,   P_STRING|P_VI_DEF,
  2621.   #ifdef FEAT_TITLE
  2622.                   (char_u *)&p_iconstring, PV_NONE,
  2623.   #else
  2624.                   (char_u *)NULL, PV_NONE,
  2625.   #endif
  2626. !                 {(char_u *)"", (char_u *)0L}},
  2627.       {"ignorecase",  "ic",   P_BOOL|P_VI_DEF,
  2628.                   (char_u *)&p_ic, PV_NONE,
  2629. !                 {(char_u *)FALSE, (char_u *)0L}},
  2630.       {"imactivatekey","imak",P_STRING|P_VI_DEF,
  2631.   #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
  2632.                   (char_u *)&p_imak, PV_NONE,
  2633.   #else
  2634.                   (char_u *)NULL, PV_NONE,
  2635.   #endif
  2636. !                 {(char_u *)"", (char_u *)0L}},
  2637.       {"imcmdline",   "imc",  P_BOOL|P_VI_DEF,
  2638.   #ifdef USE_IM_CONTROL
  2639.                   (char_u *)&p_imcmdline, PV_NONE,
  2640.   #else
  2641.                   (char_u *)NULL, PV_NONE,
  2642.   #endif
  2643. !                 {(char_u *)FALSE, (char_u *)0L}},
  2644.       {"imdisable",   "imd",  P_BOOL|P_VI_DEF,
  2645.   #ifdef USE_IM_CONTROL
  2646.                   (char_u *)&p_imdisable, PV_NONE,
  2647. --- 1311,1375 ----
  2648.                   (char_u *)NULL, PV_NONE,
  2649.                   {(char_u *)0L, (char_u *)0L}
  2650.   #endif
  2651. !                 SCRIPTID_INIT},
  2652.       {"hidden",        "hid",  P_BOOL|P_VI_DEF,
  2653.                   (char_u *)&p_hid, PV_NONE,
  2654. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2655.       {"highlight",   "hl",   P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
  2656.                   (char_u *)&p_hl, PV_NONE,
  2657. !                 {(char_u *)HIGHLIGHT_INIT, (char_u *)0L}
  2658. !                 SCRIPTID_INIT},
  2659.       {"history",        "hi",   P_NUM|P_VIM,
  2660.                   (char_u *)&p_hi, PV_NONE,
  2661. !                 {(char_u *)0L, (char_u *)20L} SCRIPTID_INIT},
  2662.       {"hkmap",        "hk",   P_BOOL|P_VI_DEF|P_VIM,
  2663.   #ifdef FEAT_RIGHTLEFT
  2664.                   (char_u *)&p_hkmap, PV_NONE,
  2665.   #else
  2666.                   (char_u *)NULL, PV_NONE,
  2667.   #endif
  2668. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2669.       {"hkmapp",        "hkp",  P_BOOL|P_VI_DEF|P_VIM,
  2670.   #ifdef FEAT_RIGHTLEFT
  2671.                   (char_u *)&p_hkmapp, PV_NONE,
  2672.   #else
  2673.                   (char_u *)NULL, PV_NONE,
  2674.   #endif
  2675. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2676.       {"hlsearch",    "hls",  P_BOOL|P_VI_DEF|P_VIM|P_RALL,
  2677.                   (char_u *)&p_hls, PV_NONE,
  2678. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2679.       {"icon",        NULL,   P_BOOL|P_VI_DEF,
  2680.   #ifdef FEAT_TITLE
  2681.                   (char_u *)&p_icon, PV_NONE,
  2682.   #else
  2683.                   (char_u *)NULL, PV_NONE,
  2684.   #endif
  2685. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2686.       {"iconstring",  NULL,   P_STRING|P_VI_DEF,
  2687.   #ifdef FEAT_TITLE
  2688.                   (char_u *)&p_iconstring, PV_NONE,
  2689.   #else
  2690.                   (char_u *)NULL, PV_NONE,
  2691.   #endif
  2692. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  2693.       {"ignorecase",  "ic",   P_BOOL|P_VI_DEF,
  2694.                   (char_u *)&p_ic, PV_NONE,
  2695. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2696.       {"imactivatekey","imak",P_STRING|P_VI_DEF,
  2697.   #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
  2698.                   (char_u *)&p_imak, PV_NONE,
  2699.   #else
  2700.                   (char_u *)NULL, PV_NONE,
  2701.   #endif
  2702. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  2703.       {"imcmdline",   "imc",  P_BOOL|P_VI_DEF,
  2704.   #ifdef USE_IM_CONTROL
  2705.                   (char_u *)&p_imcmdline, PV_NONE,
  2706.   #else
  2707.                   (char_u *)NULL, PV_NONE,
  2708.   #endif
  2709. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2710.       {"imdisable",   "imd",  P_BOOL|P_VI_DEF,
  2711.   #ifdef USE_IM_CONTROL
  2712.                   (char_u *)&p_imdisable, PV_NONE,
  2713. ***************
  2714. *** 1371,1377 ****
  2715.   #else
  2716.                   {(char_u *)FALSE, (char_u *)0L}
  2717.   #endif
  2718. !                 },
  2719.       {"iminsert",    "imi",  P_NUM|P_VI_DEF,
  2720.                   (char_u *)&p_iminsert, PV_IMI,
  2721.   #ifdef B_IMODE_IM
  2722. --- 1381,1387 ----
  2723.   #else
  2724.                   {(char_u *)FALSE, (char_u *)0L}
  2725.   #endif
  2726. !                 SCRIPTID_INIT},
  2727.       {"iminsert",    "imi",  P_NUM|P_VI_DEF,
  2728.                   (char_u *)&p_iminsert, PV_IMI,
  2729.   #ifdef B_IMODE_IM
  2730. ***************
  2731. *** 1379,1385 ****
  2732.   #else
  2733.                   {(char_u *)B_IMODE_NONE, (char_u *)0L}
  2734.   #endif
  2735. !                 },
  2736.       {"imsearch",    "ims",  P_NUM|P_VI_DEF,
  2737.                   (char_u *)&p_imsearch, PV_IMS,
  2738.   #ifdef B_IMODE_IM
  2739. --- 1389,1395 ----
  2740.   #else
  2741.                   {(char_u *)B_IMODE_NONE, (char_u *)0L}
  2742.   #endif
  2743. !                 SCRIPTID_INIT},
  2744.       {"imsearch",    "ims",  P_NUM|P_VI_DEF,
  2745.                   (char_u *)&p_imsearch, PV_IMS,
  2746.   #ifdef B_IMODE_IM
  2747. ***************
  2748. *** 1387,1393 ****
  2749.   #else
  2750.                   {(char_u *)B_IMODE_NONE, (char_u *)0L}
  2751.   #endif
  2752. !                 },
  2753.       {"include",        "inc",  P_STRING|P_ALLOCED|P_VI_DEF,
  2754.   #ifdef FEAT_FIND_ID
  2755.                   (char_u *)&p_inc, PV_INC,
  2756. --- 1397,1403 ----
  2757.   #else
  2758.                   {(char_u *)B_IMODE_NONE, (char_u *)0L}
  2759.   #endif
  2760. !                 SCRIPTID_INIT},
  2761.       {"include",        "inc",  P_STRING|P_ALLOCED|P_VI_DEF,
  2762.   #ifdef FEAT_FIND_ID
  2763.                   (char_u *)&p_inc, PV_INC,
  2764. ***************
  2765. *** 1396,1402 ****
  2766.                   (char_u *)NULL, PV_NONE,
  2767.                   {(char_u *)0L, (char_u *)0L}
  2768.   #endif
  2769. !                 },
  2770.       {"includeexpr", "inex", P_STRING|P_ALLOCED|P_VI_DEF,
  2771.   #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL)
  2772.                   (char_u *)&p_inex, PV_INEX,
  2773. --- 1406,1412 ----
  2774.                   (char_u *)NULL, PV_NONE,
  2775.                   {(char_u *)0L, (char_u *)0L}
  2776.   #endif
  2777. !                 SCRIPTID_INIT},
  2778.       {"includeexpr", "inex", P_STRING|P_ALLOCED|P_VI_DEF,
  2779.   #if defined(FEAT_FIND_ID) && defined(FEAT_EVAL)
  2780.                   (char_u *)&p_inex, PV_INEX,
  2781. ***************
  2782. *** 1405,1414 ****
  2783.                   (char_u *)NULL, PV_NONE,
  2784.                   {(char_u *)0L, (char_u *)0L}
  2785.   #endif
  2786. !                 },
  2787.       {"incsearch",   "is",   P_BOOL|P_VI_DEF|P_VIM,
  2788.                   (char_u *)&p_is, PV_NONE,
  2789. !                 {(char_u *)FALSE, (char_u *)0L}},
  2790.       {"indentexpr", "inde",  P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
  2791.   #if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
  2792.                   (char_u *)&p_inde, PV_INDE,
  2793. --- 1415,1424 ----
  2794.                   (char_u *)NULL, PV_NONE,
  2795.                   {(char_u *)0L, (char_u *)0L}
  2796.   #endif
  2797. !                 SCRIPTID_INIT},
  2798.       {"incsearch",   "is",   P_BOOL|P_VI_DEF|P_VIM,
  2799.                   (char_u *)&p_is, PV_NONE,
  2800. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2801.       {"indentexpr", "inde",  P_STRING|P_ALLOCED|P_VI_DEF|P_VIM,
  2802.   #if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
  2803.                   (char_u *)&p_inde, PV_INDE,
  2804. ***************
  2805. *** 1417,1423 ****
  2806.                   (char_u *)NULL, PV_NONE,
  2807.                   {(char_u *)0L, (char_u *)0L}
  2808.   #endif
  2809. !                 },
  2810.       {"indentkeys", "indk",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  2811.   #if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
  2812.                   (char_u *)&p_indk, PV_INDK,
  2813. --- 1427,1433 ----
  2814.                   (char_u *)NULL, PV_NONE,
  2815.                   {(char_u *)0L, (char_u *)0L}
  2816.   #endif
  2817. !                 SCRIPTID_INIT},
  2818.       {"indentkeys", "indk",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  2819.   #if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
  2820.                   (char_u *)&p_indk, PV_INDK,
  2821. ***************
  2822. *** 1426,1438 ****
  2823.                   (char_u *)NULL, PV_NONE,
  2824.                   {(char_u *)0L, (char_u *)0L}
  2825.   #endif
  2826. !                 },
  2827.       {"infercase",   "inf",  P_BOOL|P_VI_DEF,
  2828.                   (char_u *)&p_inf, PV_INF,
  2829. !                 {(char_u *)FALSE, (char_u *)0L}},
  2830.       {"insertmode",  "im",   P_BOOL|P_VI_DEF|P_VIM,
  2831.                   (char_u *)&p_im, PV_NONE,
  2832. !                 {(char_u *)FALSE, (char_u *)0L}},
  2833.       {"isfname",        "isf",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2834.                   (char_u *)&p_isf, PV_NONE,
  2835.                   {
  2836. --- 1436,1448 ----
  2837.                   (char_u *)NULL, PV_NONE,
  2838.                   {(char_u *)0L, (char_u *)0L}
  2839.   #endif
  2840. !                 SCRIPTID_INIT},
  2841.       {"infercase",   "inf",  P_BOOL|P_VI_DEF,
  2842.                   (char_u *)&p_inf, PV_INF,
  2843. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2844.       {"insertmode",  "im",   P_BOOL|P_VI_DEF|P_VIM,
  2845.                   (char_u *)&p_im, PV_NONE,
  2846. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  2847.       {"isfname",        "isf",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2848.                   (char_u *)&p_isf, PV_NONE,
  2849.                   {
  2850. ***************
  2851. *** 1455,1461 ****
  2852.   #  endif
  2853.   # endif
  2854.   #endif
  2855. !                 (char_u *)0L}},
  2856.       {"isident",        "isi",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2857.                   (char_u *)&p_isi, PV_NONE,
  2858.                   {
  2859. --- 1465,1471 ----
  2860.   #  endif
  2861.   # endif
  2862.   #endif
  2863. !                 (char_u *)0L} SCRIPTID_INIT},
  2864.       {"isident",        "isi",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2865.                   (char_u *)&p_isi, PV_NONE,
  2866.                   {
  2867. ***************
  2868. *** 1472,1478 ****
  2869.                   (char_u *)"@,48-57,_,192-255",
  2870.   # endif
  2871.   #endif
  2872. !                 (char_u *)0L}},
  2873.       {"iskeyword",   "isk",  P_STRING|P_ALLOCED|P_VIM|P_COMMA|P_NODUP,
  2874.                   (char_u *)&p_isk, PV_ISK,
  2875.                   {
  2876. --- 1482,1488 ----
  2877.                   (char_u *)"@,48-57,_,192-255",
  2878.   # endif
  2879.   #endif
  2880. !                 (char_u *)0L} SCRIPTID_INIT},
  2881.       {"iskeyword",   "isk",  P_STRING|P_ALLOCED|P_VIM|P_COMMA|P_NODUP,
  2882.                   (char_u *)&p_isk, PV_ISK,
  2883.                   {
  2884. ***************
  2885. *** 1491,1497 ****
  2886.                   ISK_LATIN1
  2887.   # endif
  2888.   #endif
  2889. !                 }},
  2890.       {"isprint",        "isp",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
  2891.                   (char_u *)&p_isp, PV_NONE,
  2892.                   {
  2893. --- 1501,1507 ----
  2894.                   ISK_LATIN1
  2895.   # endif
  2896.   #endif
  2897. !                 } SCRIPTID_INIT},
  2898.       {"isprint",        "isp",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
  2899.                   (char_u *)&p_isp, PV_NONE,
  2900.                   {
  2901. ***************
  2902. *** 1507,1516 ****
  2903.                   ISP_LATIN1,
  2904.   # endif
  2905.   #endif
  2906. !                 (char_u *)0L}},
  2907.       {"joinspaces",  "js",   P_BOOL|P_VI_DEF|P_VIM,
  2908.                   (char_u *)&p_js, PV_NONE,
  2909. !                 {(char_u *)TRUE, (char_u *)0L}},
  2910.       {"key",        NULL,   P_STRING|P_ALLOCED|P_VI_DEF|P_NO_MKRC,
  2911.   #ifdef FEAT_CRYPT
  2912.                   (char_u *)&p_key, PV_KEY,
  2913. --- 1517,1526 ----
  2914.                   ISP_LATIN1,
  2915.   # endif
  2916.   #endif
  2917. !                 (char_u *)0L} SCRIPTID_INIT},
  2918.       {"joinspaces",  "js",   P_BOOL|P_VI_DEF|P_VIM,
  2919.                   (char_u *)&p_js, PV_NONE,
  2920. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  2921.       {"key",        NULL,   P_STRING|P_ALLOCED|P_VI_DEF|P_NO_MKRC,
  2922.   #ifdef FEAT_CRYPT
  2923.                   (char_u *)&p_key, PV_KEY,
  2924. ***************
  2925. *** 1519,1525 ****
  2926.                   (char_u *)NULL, PV_NONE,
  2927.                   {(char_u *)0L, (char_u *)0L}
  2928.   #endif
  2929. !                 },
  2930.       {"keymap",        "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME|P_PRI_MKRC,
  2931.   #ifdef FEAT_KEYMAP
  2932.                   (char_u *)&p_keymap, PV_KMAP,
  2933. --- 1529,1535 ----
  2934.                   (char_u *)NULL, PV_NONE,
  2935.                   {(char_u *)0L, (char_u *)0L}
  2936.   #endif
  2937. !                 SCRIPTID_INIT},
  2938.       {"keymap",        "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME|P_PRI_MKRC,
  2939.   #ifdef FEAT_KEYMAP
  2940.                   (char_u *)&p_keymap, PV_KMAP,
  2941. ***************
  2942. *** 1528,1541 ****
  2943.                   (char_u *)NULL, PV_NONE,
  2944.                   {(char_u *)"", (char_u *)0L}
  2945.   #endif
  2946. !     },
  2947.       {"keymodel",    "km",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2948.   #ifdef FEAT_VISUAL
  2949.                   (char_u *)&p_km, PV_NONE,
  2950.   #else
  2951.                   (char_u *)NULL, PV_NONE,
  2952.   #endif
  2953. !                 {(char_u *)"", (char_u *)0L}},
  2954.       {"keywordprg",  "kp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  2955.                   (char_u *)&p_kp, PV_KP,
  2956.                   {
  2957. --- 1538,1551 ----
  2958.                   (char_u *)NULL, PV_NONE,
  2959.                   {(char_u *)"", (char_u *)0L}
  2960.   #endif
  2961. !                 SCRIPTID_INIT},
  2962.       {"keymodel",    "km",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2963.   #ifdef FEAT_VISUAL
  2964.                   (char_u *)&p_km, PV_NONE,
  2965.   #else
  2966.                   (char_u *)NULL, PV_NONE,
  2967.   #endif
  2968. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  2969.       {"keywordprg",  "kp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  2970.                   (char_u *)&p_kp, PV_KP,
  2971.                   {
  2972. ***************
  2973. *** 1556,1562 ****
  2974.   # endif
  2975.   #endif
  2976.   #endif
  2977. !                 (char_u *)0L}},
  2978.       {"langmap",     "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2979.   #ifdef FEAT_LANGMAP
  2980.                   (char_u *)&p_langmap, PV_NONE,
  2981. --- 1566,1572 ----
  2982.   # endif
  2983.   #endif
  2984.   #endif
  2985. !                 (char_u *)0L} SCRIPTID_INIT},
  2986.       {"langmap",     "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  2987.   #ifdef FEAT_LANGMAP
  2988.                   (char_u *)&p_langmap, PV_NONE,
  2989. ***************
  2990. *** 1565,1595 ****
  2991.                   (char_u *)NULL, PV_NONE,
  2992.                   {(char_u *)NULL,
  2993.   #endif
  2994. !                 (char_u *)0L}},
  2995.       {"langmenu",    "lm",   P_STRING|P_VI_DEF|P_NFNAME,
  2996.   #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG)
  2997.                   (char_u *)&p_lm, PV_NONE,
  2998.   #else
  2999.                   (char_u *)NULL, PV_NONE,
  3000.   #endif
  3001. !                 {(char_u *)"", (char_u *)0L}},
  3002.       {"laststatus",  "ls",   P_NUM|P_VI_DEF|P_RALL,
  3003.   #ifdef FEAT_WINDOWS
  3004.                   (char_u *)&p_ls, PV_NONE,
  3005.   #else
  3006.                   (char_u *)NULL, PV_NONE,
  3007.   #endif
  3008. !                 {(char_u *)1L, (char_u *)0L}},
  3009.       {"lazyredraw",  "lz",   P_BOOL|P_VI_DEF,
  3010.                   (char_u *)&p_lz, PV_NONE,
  3011. !                 {(char_u *)FALSE, (char_u *)0L}},
  3012.       {"linebreak",   "lbr",  P_BOOL|P_VI_DEF|P_RWIN,
  3013.   #ifdef FEAT_LINEBREAK
  3014.                   (char_u *)VAR_WIN, PV_LBR,
  3015.   #else
  3016.                   (char_u *)NULL, PV_NONE,
  3017.   #endif
  3018. !                 {(char_u *)FALSE, (char_u *)0L}},
  3019.       {"lines",        NULL,   P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
  3020.                   (char_u *)&Rows, PV_NONE,
  3021.                   {
  3022. --- 1575,1605 ----
  3023.                   (char_u *)NULL, PV_NONE,
  3024.                   {(char_u *)NULL,
  3025.   #endif
  3026. !                 (char_u *)0L} SCRIPTID_INIT},
  3027.       {"langmenu",    "lm",   P_STRING|P_VI_DEF|P_NFNAME,
  3028.   #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG)
  3029.                   (char_u *)&p_lm, PV_NONE,
  3030.   #else
  3031.                   (char_u *)NULL, PV_NONE,
  3032.   #endif
  3033. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  3034.       {"laststatus",  "ls",   P_NUM|P_VI_DEF|P_RALL,
  3035.   #ifdef FEAT_WINDOWS
  3036.                   (char_u *)&p_ls, PV_NONE,
  3037.   #else
  3038.                   (char_u *)NULL, PV_NONE,
  3039.   #endif
  3040. !                 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
  3041.       {"lazyredraw",  "lz",   P_BOOL|P_VI_DEF,
  3042.                   (char_u *)&p_lz, PV_NONE,
  3043. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3044.       {"linebreak",   "lbr",  P_BOOL|P_VI_DEF|P_RWIN,
  3045.   #ifdef FEAT_LINEBREAK
  3046.                   (char_u *)VAR_WIN, PV_LBR,
  3047.   #else
  3048.                   (char_u *)NULL, PV_NONE,
  3049.   #endif
  3050. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3051.       {"lines",        NULL,   P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
  3052.                   (char_u *)&Rows, PV_NONE,
  3053.                   {
  3054. ***************
  3055. *** 1598,1604 ****
  3056.   #else
  3057.                   (char_u *)24L,
  3058.   #endif
  3059. !                         (char_u *)0L}},
  3060.       {"linespace",   "lsp",  P_NUM|P_VI_DEF|P_RCLR,
  3061.   #ifdef FEAT_GUI
  3062.                   (char_u *)&p_linespace, PV_NONE,
  3063. --- 1608,1614 ----
  3064.   #else
  3065.                   (char_u *)24L,
  3066.   #endif
  3067. !                         (char_u *)0L} SCRIPTID_INIT},
  3068.       {"linespace",   "lsp",  P_NUM|P_VI_DEF|P_RCLR,
  3069.   #ifdef FEAT_GUI
  3070.                   (char_u *)&p_linespace, PV_NONE,
  3071. ***************
  3072. *** 1610,1623 ****
  3073.   #else
  3074.                   {(char_u *)0L, (char_u *)0L}
  3075.   #endif
  3076. !                 },
  3077.       {"lisp",        NULL,   P_BOOL|P_VI_DEF,
  3078.   #ifdef FEAT_LISP
  3079.                   (char_u *)&p_lisp, PV_LISP,
  3080.   #else
  3081.                   (char_u *)NULL, PV_NONE,
  3082.   #endif
  3083. !                 {(char_u *)FALSE, (char_u *)0L}},
  3084.       {"lispwords",   "lw",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  3085.   #ifdef FEAT_LISP
  3086.                   (char_u *)&p_lispwords, PV_NONE,
  3087. --- 1620,1633 ----
  3088.   #else
  3089.                   {(char_u *)0L, (char_u *)0L}
  3090.   #endif
  3091. !                 SCRIPTID_INIT},
  3092.       {"lisp",        NULL,   P_BOOL|P_VI_DEF,
  3093.   #ifdef FEAT_LISP
  3094.                   (char_u *)&p_lisp, PV_LISP,
  3095.   #else
  3096.                   (char_u *)NULL, PV_NONE,
  3097.   #endif
  3098. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3099.       {"lispwords",   "lw",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  3100.   #ifdef FEAT_LISP
  3101.                   (char_u *)&p_lispwords, PV_NONE,
  3102. ***************
  3103. *** 1626,1649 ****
  3104.                   (char_u *)NULL, PV_NONE,
  3105.                   {(char_u *)"", (char_u *)0L}
  3106.   #endif
  3107. !                 },
  3108.       {"list",        NULL,   P_BOOL|P_VI_DEF|P_RWIN,
  3109.                   (char_u *)VAR_WIN, PV_LIST,
  3110. !                 {(char_u *)FALSE, (char_u *)0L}},
  3111.       {"listchars",   "lcs",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
  3112.                   (char_u *)&p_lcs, PV_NONE,
  3113. !                 {(char_u *)"eol:$", (char_u *)0L}},
  3114.       {"loadplugins", "lpl",  P_BOOL|P_VI_DEF,
  3115.                   (char_u *)&p_lpl, PV_NONE,
  3116. !                 {(char_u *)TRUE, (char_u *)0L}},
  3117.   #ifdef FEAT_GUI_MAC
  3118.       {"macatsui",    NULL,   P_BOOL|P_VI_DEF|P_RCLR,
  3119.                   (char_u *)&p_macatsui, PV_NONE,
  3120. !                 {(char_u *)TRUE, (char_u *)0L}},
  3121.   #endif
  3122.       {"magic",        NULL,   P_BOOL|P_VI_DEF,
  3123.                   (char_u *)&p_magic, PV_NONE,
  3124. !                 {(char_u *)TRUE, (char_u *)0L}},
  3125.       {"makeef",        "mef",  P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  3126.   #ifdef FEAT_QUICKFIX
  3127.                   (char_u *)&p_mef, PV_NONE,
  3128. --- 1636,1659 ----
  3129.                   (char_u *)NULL, PV_NONE,
  3130.                   {(char_u *)"", (char_u *)0L}
  3131.   #endif
  3132. !                 SCRIPTID_INIT},
  3133.       {"list",        NULL,   P_BOOL|P_VI_DEF|P_RWIN,
  3134.                   (char_u *)VAR_WIN, PV_LIST,
  3135. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3136.       {"listchars",   "lcs",  P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
  3137.                   (char_u *)&p_lcs, PV_NONE,
  3138. !                 {(char_u *)"eol:$", (char_u *)0L} SCRIPTID_INIT},
  3139.       {"loadplugins", "lpl",  P_BOOL|P_VI_DEF,
  3140.                   (char_u *)&p_lpl, PV_NONE,
  3141. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  3142.   #ifdef FEAT_GUI_MAC
  3143.       {"macatsui",    NULL,   P_BOOL|P_VI_DEF|P_RCLR,
  3144.                   (char_u *)&p_macatsui, PV_NONE,
  3145. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  3146.   #endif
  3147.       {"magic",        NULL,   P_BOOL|P_VI_DEF,
  3148.                   (char_u *)&p_magic, PV_NONE,
  3149. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  3150.       {"makeef",        "mef",  P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  3151.   #ifdef FEAT_QUICKFIX
  3152.                   (char_u *)&p_mef, PV_NONE,
  3153. ***************
  3154. *** 1652,1658 ****
  3155.                   (char_u *)NULL, PV_NONE,
  3156.                   {(char_u *)NULL, (char_u *)0L}
  3157.   #endif
  3158. !                 },
  3159.       {"makeprg",        "mp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  3160.   #ifdef FEAT_QUICKFIX
  3161.                   (char_u *)&p_mp, PV_MP,
  3162. --- 1662,1668 ----
  3163.                   (char_u *)NULL, PV_NONE,
  3164.                   {(char_u *)NULL, (char_u *)0L}
  3165.   #endif
  3166. !                 SCRIPTID_INIT},
  3167.       {"makeprg",        "mp",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  3168.   #ifdef FEAT_QUICKFIX
  3169.                   (char_u *)&p_mp, PV_MP,
  3170. ***************
  3171. *** 1665,1713 ****
  3172.                   (char_u *)NULL, PV_NONE,
  3173.                   {(char_u *)NULL, (char_u *)0L}
  3174.   #endif
  3175. !                 },
  3176.       {"matchpairs",  "mps",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  3177.                   (char_u *)&p_mps, PV_MPS,
  3178. !                 {(char_u *)"(:),{:},[:]", (char_u *)0L}},
  3179.       {"matchtime",   "mat",  P_NUM|P_VI_DEF,
  3180.                   (char_u *)&p_mat, PV_NONE,
  3181. !                 {(char_u *)5L, (char_u *)0L}},
  3182.       {"maxcombine",  "mco",  P_NUM|P_VI_DEF,
  3183.   #ifdef FEAT_MBYTE
  3184.                   (char_u *)&p_mco, PV_NONE,
  3185.   #else
  3186.                   (char_u *)NULL, PV_NONE,
  3187.   #endif
  3188. !                 {(char_u *)2, (char_u *)0L}},
  3189.       {"maxfuncdepth", "mfd", P_NUM|P_VI_DEF,
  3190.   #ifdef FEAT_EVAL
  3191.                   (char_u *)&p_mfd, PV_NONE,
  3192.   #else
  3193.                   (char_u *)NULL, PV_NONE,
  3194.   #endif
  3195. !                 {(char_u *)100L, (char_u *)0L}},
  3196.       {"maxmapdepth", "mmd",  P_NUM|P_VI_DEF,
  3197.                   (char_u *)&p_mmd, PV_NONE,
  3198. !                 {(char_u *)1000L, (char_u *)0L}},
  3199.       {"maxmem",        "mm",   P_NUM|P_VI_DEF,
  3200.                   (char_u *)&p_mm, PV_NONE,
  3201. !                 {(char_u *)DFLT_MAXMEM, (char_u *)0L}},
  3202.       {"maxmempattern","mmp", P_NUM|P_VI_DEF,
  3203.                   (char_u *)&p_mmp, PV_NONE,
  3204. !                 {(char_u *)1000L, (char_u *)0L}},
  3205.       {"maxmemtot",   "mmt",  P_NUM|P_VI_DEF,
  3206.                   (char_u *)&p_mmt, PV_NONE,
  3207. !                 {(char_u *)DFLT_MAXMEMTOT, (char_u *)0L}},
  3208.       {"menuitems",   "mis",  P_NUM|P_VI_DEF,
  3209.   #ifdef FEAT_MENU
  3210.                   (char_u *)&p_mis, PV_NONE,
  3211.   #else
  3212.                   (char_u *)NULL, PV_NONE,
  3213.   #endif
  3214. !                 {(char_u *)25L, (char_u *)0L}},
  3215.       {"mesg",        NULL,   P_BOOL|P_VI_DEF,
  3216.                   (char_u *)NULL, PV_NONE,
  3217. !                 {(char_u *)FALSE, (char_u *)0L}},
  3218.       {"mkspellmem",  "msm",  P_STRING|P_VI_DEF|P_EXPAND|P_SECURE,
  3219.   #ifdef FEAT_SPELL
  3220.                   (char_u *)&p_msm, PV_NONE,
  3221. --- 1675,1726 ----
  3222.                   (char_u *)NULL, PV_NONE,
  3223.                   {(char_u *)NULL, (char_u *)0L}
  3224.   #endif
  3225. !                 SCRIPTID_INIT},
  3226.       {"matchpairs",  "mps",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  3227.                   (char_u *)&p_mps, PV_MPS,
  3228. !                 {(char_u *)"(:),{:},[:]", (char_u *)0L}
  3229. !                 SCRIPTID_INIT},
  3230.       {"matchtime",   "mat",  P_NUM|P_VI_DEF,
  3231.                   (char_u *)&p_mat, PV_NONE,
  3232. !                 {(char_u *)5L, (char_u *)0L} SCRIPTID_INIT},
  3233.       {"maxcombine",  "mco",  P_NUM|P_VI_DEF,
  3234.   #ifdef FEAT_MBYTE
  3235.                   (char_u *)&p_mco, PV_NONE,
  3236.   #else
  3237.                   (char_u *)NULL, PV_NONE,
  3238.   #endif
  3239. !                 {(char_u *)2, (char_u *)0L} SCRIPTID_INIT},
  3240.       {"maxfuncdepth", "mfd", P_NUM|P_VI_DEF,
  3241.   #ifdef FEAT_EVAL
  3242.                   (char_u *)&p_mfd, PV_NONE,
  3243.   #else
  3244.                   (char_u *)NULL, PV_NONE,
  3245.   #endif
  3246. !                 {(char_u *)100L, (char_u *)0L} SCRIPTID_INIT},
  3247.       {"maxmapdepth", "mmd",  P_NUM|P_VI_DEF,
  3248.                   (char_u *)&p_mmd, PV_NONE,
  3249. !                 {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT},
  3250.       {"maxmem",        "mm",   P_NUM|P_VI_DEF,
  3251.                   (char_u *)&p_mm, PV_NONE,
  3252. !                 {(char_u *)DFLT_MAXMEM, (char_u *)0L}
  3253. !                 SCRIPTID_INIT},
  3254.       {"maxmempattern","mmp", P_NUM|P_VI_DEF,
  3255.                   (char_u *)&p_mmp, PV_NONE,
  3256. !                 {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT},
  3257.       {"maxmemtot",   "mmt",  P_NUM|P_VI_DEF,
  3258.                   (char_u *)&p_mmt, PV_NONE,
  3259. !                 {(char_u *)DFLT_MAXMEMTOT, (char_u *)0L}
  3260. !                 SCRIPTID_INIT},
  3261.       {"menuitems",   "mis",  P_NUM|P_VI_DEF,
  3262.   #ifdef FEAT_MENU
  3263.                   (char_u *)&p_mis, PV_NONE,
  3264.   #else
  3265.                   (char_u *)NULL, PV_NONE,
  3266.   #endif
  3267. !                 {(char_u *)25L, (char_u *)0L} SCRIPTID_INIT},
  3268.       {"mesg",        NULL,   P_BOOL|P_VI_DEF,
  3269.                   (char_u *)NULL, PV_NONE,
  3270. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3271.       {"mkspellmem",  "msm",  P_STRING|P_VI_DEF|P_EXPAND|P_SECURE,
  3272.   #ifdef FEAT_SPELL
  3273.                   (char_u *)&p_msm, PV_NONE,
  3274. ***************
  3275. *** 1716,1737 ****
  3276.                   (char_u *)NULL, PV_NONE,
  3277.                   {(char_u *)0L, (char_u *)0L}
  3278.   #endif
  3279. !     },
  3280.       {"modeline",    "ml",   P_BOOL|P_VIM,
  3281.                   (char_u *)&p_ml, PV_ML,
  3282. !                 {(char_u *)FALSE, (char_u *)TRUE}},
  3283.       {"modelines",   "mls",  P_NUM|P_VI_DEF,
  3284.                   (char_u *)&p_mls, PV_NONE,
  3285. !                 {(char_u *)5L, (char_u *)0L}},
  3286.       {"modifiable",  "ma",   P_BOOL|P_VI_DEF|P_NOGLOB,
  3287.                   (char_u *)&p_ma, PV_MA,
  3288. !                 {(char_u *)TRUE, (char_u *)0L}},
  3289.       {"modified",    "mod",  P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
  3290.                   (char_u *)&p_mod, PV_MOD,
  3291. !                 {(char_u *)FALSE, (char_u *)0L}},
  3292.       {"more",        NULL,   P_BOOL|P_VIM,
  3293.                   (char_u *)&p_more, PV_NONE,
  3294. !                 {(char_u *)FALSE, (char_u *)TRUE}},
  3295.       {"mouse",        NULL,   P_STRING|P_VI_DEF|P_FLAGLIST,
  3296.                   (char_u *)&p_mouse, PV_NONE,
  3297.                   {
  3298. --- 1729,1750 ----
  3299.                   (char_u *)NULL, PV_NONE,
  3300.                   {(char_u *)0L, (char_u *)0L}
  3301.   #endif
  3302. !                 SCRIPTID_INIT},
  3303.       {"modeline",    "ml",   P_BOOL|P_VIM,
  3304.                   (char_u *)&p_ml, PV_ML,
  3305. !                 {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
  3306.       {"modelines",   "mls",  P_NUM|P_VI_DEF,
  3307.                   (char_u *)&p_mls, PV_NONE,
  3308. !                 {(char_u *)5L, (char_u *)0L} SCRIPTID_INIT},
  3309.       {"modifiable",  "ma",   P_BOOL|P_VI_DEF|P_NOGLOB,
  3310.                   (char_u *)&p_ma, PV_MA,
  3311. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  3312.       {"modified",    "mod",  P_BOOL|P_NO_MKRC|P_VI_DEF|P_RSTAT,
  3313.                   (char_u *)&p_mod, PV_MOD,
  3314. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3315.       {"more",        NULL,   P_BOOL|P_VIM,
  3316.                   (char_u *)&p_more, PV_NONE,
  3317. !                 {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
  3318.       {"mouse",        NULL,   P_STRING|P_VI_DEF|P_FLAGLIST,
  3319.                   (char_u *)&p_mouse, PV_NONE,
  3320.                   {
  3321. ***************
  3322. *** 1740,1760 ****
  3323.   #else
  3324.                   (char_u *)"",
  3325.   #endif
  3326. !                 (char_u *)0L}},
  3327.       {"mousefocus",   "mousef", P_BOOL|P_VI_DEF,
  3328.   #ifdef FEAT_GUI
  3329.                   (char_u *)&p_mousef, PV_NONE,
  3330.   #else
  3331.                   (char_u *)NULL, PV_NONE,
  3332.   #endif
  3333. !                 {(char_u *)FALSE, (char_u *)0L}},
  3334.       {"mousehide",   "mh",   P_BOOL|P_VI_DEF,
  3335.   #ifdef FEAT_GUI
  3336.                   (char_u *)&p_mh, PV_NONE,
  3337.   #else
  3338.                   (char_u *)NULL, PV_NONE,
  3339.   #endif
  3340. !                 {(char_u *)TRUE, (char_u *)0L}},
  3341.       {"mousemodel",  "mousem", P_STRING|P_VI_DEF,
  3342.                   (char_u *)&p_mousem, PV_NONE,
  3343.                   {
  3344. --- 1753,1773 ----
  3345.   #else
  3346.                   (char_u *)"",
  3347.   #endif
  3348. !                 (char_u *)0L} SCRIPTID_INIT},
  3349.       {"mousefocus",   "mousef", P_BOOL|P_VI_DEF,
  3350.   #ifdef FEAT_GUI
  3351.                   (char_u *)&p_mousef, PV_NONE,
  3352.   #else
  3353.                   (char_u *)NULL, PV_NONE,
  3354.   #endif
  3355. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3356.       {"mousehide",   "mh",   P_BOOL|P_VI_DEF,
  3357.   #ifdef FEAT_GUI
  3358.                   (char_u *)&p_mh, PV_NONE,
  3359.   #else
  3360.                   (char_u *)NULL, PV_NONE,
  3361.   #endif
  3362. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  3363.       {"mousemodel",  "mousem", P_STRING|P_VI_DEF,
  3364.                   (char_u *)&p_mousem, PV_NONE,
  3365.                   {
  3366. ***************
  3367. *** 1767,1773 ****
  3368.                   (char_u *)"extend",
  3369.   # endif
  3370.   #endif
  3371. !                 (char_u *)0L}},
  3372.       {"mouseshape",  "mouses",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  3373.   #ifdef FEAT_MOUSESHAPE
  3374.                   (char_u *)&p_mouseshape, PV_NONE,
  3375. --- 1780,1786 ----
  3376.                   (char_u *)"extend",
  3377.   # endif
  3378.   #endif
  3379. !                 (char_u *)0L} SCRIPTID_INIT},
  3380.       {"mouseshape",  "mouses",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  3381.   #ifdef FEAT_MOUSESHAPE
  3382.                   (char_u *)&p_mouseshape, PV_NONE,
  3383. ***************
  3384. *** 1776,1808 ****
  3385.                   (char_u *)NULL, PV_NONE,
  3386.                   {(char_u *)NULL, (char_u *)0L}
  3387.   #endif
  3388. !                 },
  3389.       {"mousetime",   "mouset",    P_NUM|P_VI_DEF,
  3390.                   (char_u *)&p_mouset, PV_NONE,
  3391. !                 {(char_u *)500L, (char_u *)0L}},
  3392.       {"mzquantum",  "mzq",   P_NUM,
  3393.   #ifdef FEAT_MZSCHEME
  3394.                   (char_u *)&p_mzq, PV_NONE,
  3395.   #else
  3396.                   (char_u *)NULL, PV_NONE,
  3397.   #endif
  3398. !                 {(char_u *)100L, (char_u *)100L}},
  3399.       {"novice",        NULL,   P_BOOL|P_VI_DEF,
  3400.                   (char_u *)NULL, PV_NONE,
  3401. !                 {(char_u *)FALSE, (char_u *)0L}},
  3402.       {"nrformats",   "nf",   P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  3403.                   (char_u *)&p_nf, PV_NF,
  3404. !                 {(char_u *)"octal,hex", (char_u *)0L}},
  3405.       {"number",        "nu",   P_BOOL|P_VI_DEF|P_RWIN,
  3406.                   (char_u *)VAR_WIN, PV_NU,
  3407. !                 {(char_u *)FALSE, (char_u *)0L}},
  3408.       {"numberwidth", "nuw",  P_NUM|P_RWIN|P_VIM,
  3409.   #ifdef FEAT_LINEBREAK
  3410.                   (char_u *)VAR_WIN, PV_NUW,
  3411.   #else
  3412.                   (char_u *)NULL, PV_NONE,
  3413.   #endif
  3414. !                 {(char_u *)8L, (char_u *)4L}},
  3415.       {"omnifunc",    "ofu",  P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE,
  3416.   #ifdef FEAT_COMPL_FUNC
  3417.                   (char_u *)&p_ofu, PV_OFU,
  3418. --- 1789,1822 ----
  3419.                   (char_u *)NULL, PV_NONE,
  3420.                   {(char_u *)NULL, (char_u *)0L}
  3421.   #endif
  3422. !                 SCRIPTID_INIT},
  3423.       {"mousetime",   "mouset",    P_NUM|P_VI_DEF,
  3424.                   (char_u *)&p_mouset, PV_NONE,
  3425. !                 {(char_u *)500L, (char_u *)0L} SCRIPTID_INIT},
  3426.       {"mzquantum",  "mzq",   P_NUM,
  3427.   #ifdef FEAT_MZSCHEME
  3428.                   (char_u *)&p_mzq, PV_NONE,
  3429.   #else
  3430.                   (char_u *)NULL, PV_NONE,
  3431.   #endif
  3432. !                 {(char_u *)100L, (char_u *)100L} SCRIPTID_INIT},
  3433.       {"novice",        NULL,   P_BOOL|P_VI_DEF,
  3434.                   (char_u *)NULL, PV_NONE,
  3435. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3436.       {"nrformats",   "nf",   P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
  3437.                   (char_u *)&p_nf, PV_NF,
  3438. !                 {(char_u *)"octal,hex", (char_u *)0L}
  3439. !                 SCRIPTID_INIT},
  3440.       {"number",        "nu",   P_BOOL|P_VI_DEF|P_RWIN,
  3441.                   (char_u *)VAR_WIN, PV_NU,
  3442. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3443.       {"numberwidth", "nuw",  P_NUM|P_RWIN|P_VIM,
  3444.   #ifdef FEAT_LINEBREAK
  3445.                   (char_u *)VAR_WIN, PV_NUW,
  3446.   #else
  3447.                   (char_u *)NULL, PV_NONE,
  3448.   #endif
  3449. !                 {(char_u *)8L, (char_u *)4L} SCRIPTID_INIT},
  3450.       {"omnifunc",    "ofu",  P_STRING|P_ALLOCED|P_VI_DEF|P_SECURE,
  3451.   #ifdef FEAT_COMPL_FUNC
  3452.                   (char_u *)&p_ofu, PV_OFU,
  3453. ***************
  3454. *** 1811,1820 ****
  3455.                   (char_u *)NULL, PV_NONE,
  3456.                   {(char_u *)0L, (char_u *)0L}
  3457.   #endif
  3458. !                 },
  3459.       {"open",        NULL,   P_BOOL|P_VI_DEF,
  3460.                   (char_u *)NULL, PV_NONE,
  3461. !                 {(char_u *)FALSE, (char_u *)0L}},
  3462.       {"opendevice",  "odev", P_BOOL|P_VI_DEF,
  3463.   #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
  3464.                   (char_u *)&p_odev, PV_NONE,
  3465. --- 1825,1834 ----
  3466.                   (char_u *)NULL, PV_NONE,
  3467.                   {(char_u *)0L, (char_u *)0L}
  3468.   #endif
  3469. !                 SCRIPTID_INIT},
  3470.       {"open",        NULL,   P_BOOL|P_VI_DEF,
  3471.                   (char_u *)NULL, PV_NONE,
  3472. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3473.       {"opendevice",  "odev", P_BOOL|P_VI_DEF,
  3474.   #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
  3475.                   (char_u *)&p_odev, PV_NONE,
  3476. ***************
  3477. *** 1822,1834 ****
  3478.                   (char_u *)NULL, PV_NONE,
  3479.   #endif
  3480.                   {(char_u *)FALSE, (char_u *)FALSE}
  3481. !                 },
  3482.       {"operatorfunc", "opfunc", P_STRING|P_VI_DEF|P_SECURE,
  3483.                   (char_u *)&p_opfunc, PV_NONE,
  3484. !                 {(char_u *)"", (char_u *)0L} },
  3485.       {"optimize",    "opt",  P_BOOL|P_VI_DEF,
  3486.                   (char_u *)NULL, PV_NONE,
  3487. !                 {(char_u *)FALSE, (char_u *)0L}},
  3488.       {"osfiletype",  "oft",  P_STRING|P_ALLOCED|P_VI_DEF,
  3489.   #ifdef FEAT_OSFILETYPE
  3490.                   (char_u *)&p_oft, PV_OFT,
  3491. --- 1836,1848 ----
  3492.                   (char_u *)NULL, PV_NONE,
  3493.   #endif
  3494.                   {(char_u *)FALSE, (char_u *)FALSE}
  3495. !                 SCRIPTID_INIT},
  3496.       {"operatorfunc", "opfunc", P_STRING|P_VI_DEF|P_SECURE,
  3497.                   (char_u *)&p_opfunc, PV_NONE,
  3498. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  3499.       {"optimize",    "opt",  P_BOOL|P_VI_DEF,
  3500.                   (char_u *)NULL, PV_NONE,
  3501. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3502.       {"osfiletype",  "oft",  P_STRING|P_ALLOCED|P_VI_DEF,
  3503.   #ifdef FEAT_OSFILETYPE
  3504.                   (char_u *)&p_oft, PV_OFT,
  3505. ***************
  3506. *** 1837,1853 ****
  3507.                   (char_u *)NULL, PV_NONE,
  3508.                   {(char_u *)0L, (char_u *)0L}
  3509.   #endif
  3510. !                 },
  3511.       {"paragraphs",  "para", P_STRING|P_VI_DEF,
  3512.                   (char_u *)&p_para, PV_NONE,
  3513.                   {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp",
  3514. !                 (char_u *)0L}},
  3515.       {"paste",        NULL,   P_BOOL|P_VI_DEF|P_PRI_MKRC,
  3516.                   (char_u *)&p_paste, PV_NONE,
  3517. !                 {(char_u *)FALSE, (char_u *)0L}},
  3518.       {"pastetoggle", "pt",   P_STRING|P_VI_DEF,
  3519.                   (char_u *)&p_pt, PV_NONE,
  3520. !                 {(char_u *)"", (char_u *)0L}},
  3521.       {"patchexpr",   "pex",  P_STRING|P_VI_DEF|P_SECURE,
  3522.   #if defined(FEAT_DIFF) && defined(FEAT_EVAL)
  3523.                   (char_u *)&p_pex, PV_NONE,
  3524. --- 1851,1867 ----
  3525.                   (char_u *)NULL, PV_NONE,
  3526.                   {(char_u *)0L, (char_u *)0L}
  3527.   #endif
  3528. !                 SCRIPTID_INIT},
  3529.       {"paragraphs",  "para", P_STRING|P_VI_DEF,
  3530.                   (char_u *)&p_para, PV_NONE,
  3531.                   {(char_u *)"IPLPPPQPP TPHPLIPpLpItpplpipbp",
  3532. !                 (char_u *)0L} SCRIPTID_INIT},
  3533.       {"paste",        NULL,   P_BOOL|P_VI_DEF|P_PRI_MKRC,
  3534.                   (char_u *)&p_paste, PV_NONE,
  3535. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3536.       {"pastetoggle", "pt",   P_STRING|P_VI_DEF,
  3537.                   (char_u *)&p_pt, PV_NONE,
  3538. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  3539.       {"patchexpr",   "pex",  P_STRING|P_VI_DEF|P_SECURE,
  3540.   #if defined(FEAT_DIFF) && defined(FEAT_EVAL)
  3541.                   (char_u *)&p_pex, PV_NONE,
  3542. ***************
  3543. *** 1856,1865 ****
  3544.                   (char_u *)NULL, PV_NONE,
  3545.                   {(char_u *)0L, (char_u *)0L}
  3546.   #endif
  3547. !                 },
  3548.       {"patchmode",   "pm",   P_STRING|P_VI_DEF|P_NFNAME,
  3549.                   (char_u *)&p_pm, PV_NONE,
  3550. !                 {(char_u *)"", (char_u *)0L}},
  3551.       {"path",        "pa",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
  3552.                   (char_u *)&p_path, PV_PATH,
  3553.                   {
  3554. --- 1870,1879 ----
  3555.                   (char_u *)NULL, PV_NONE,
  3556.                   {(char_u *)0L, (char_u *)0L}
  3557.   #endif
  3558. !                 SCRIPTID_INIT},
  3559.       {"patchmode",   "pm",   P_STRING|P_VI_DEF|P_NFNAME,
  3560.                   (char_u *)&p_pm, PV_NONE,
  3561. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  3562.       {"path",        "pa",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
  3563.                   (char_u *)&p_path, PV_PATH,
  3564.                   {
  3565. ***************
  3566. *** 1872,1895 ****
  3567.                   (char_u *)".,/usr/include,,",
  3568.   # endif
  3569.   #endif
  3570. !                 (char_u *)0L}},
  3571.       {"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM,
  3572.                   (char_u *)&p_pi, PV_PI,
  3573. !                 {(char_u *)FALSE, (char_u *)0L}},
  3574.       {"previewheight", "pvh", P_NUM|P_VI_DEF,
  3575.   #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
  3576.                   (char_u *)&p_pvh, PV_NONE,
  3577.   #else
  3578.                   (char_u *)NULL, PV_NONE,
  3579.   #endif
  3580. !                 {(char_u *)12L, (char_u *)0L}},
  3581.       {"previewwindow", "pvw", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB,
  3582.   #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
  3583.                   (char_u *)VAR_WIN, PV_PVW,
  3584.   #else
  3585.                   (char_u *)NULL, PV_NONE,
  3586.   #endif
  3587. !                 {(char_u *)FALSE, (char_u *)0L}},
  3588.       {"printdevice", "pdev", P_STRING|P_VI_DEF|P_SECURE,
  3589.   #ifdef FEAT_PRINTER
  3590.                   (char_u *)&p_pdev, PV_NONE,
  3591. --- 1886,1909 ----
  3592.                   (char_u *)".,/usr/include,,",
  3593.   # endif
  3594.   #endif
  3595. !                 (char_u *)0L} SCRIPTID_INIT},
  3596.       {"preserveindent", "pi", P_BOOL|P_VI_DEF|P_VIM,
  3597.                   (char_u *)&p_pi, PV_PI,
  3598. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3599.       {"previewheight", "pvh", P_NUM|P_VI_DEF,
  3600.   #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
  3601.                   (char_u *)&p_pvh, PV_NONE,
  3602.   #else
  3603.                   (char_u *)NULL, PV_NONE,
  3604.   #endif
  3605. !                 {(char_u *)12L, (char_u *)0L} SCRIPTID_INIT},
  3606.       {"previewwindow", "pvw", P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB,
  3607.   #if defined(FEAT_WINDOWS) && defined(FEAT_QUICKFIX)
  3608.                   (char_u *)VAR_WIN, PV_PVW,
  3609.   #else
  3610.                   (char_u *)NULL, PV_NONE,
  3611.   #endif
  3612. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3613.       {"printdevice", "pdev", P_STRING|P_VI_DEF|P_SECURE,
  3614.   #ifdef FEAT_PRINTER
  3615.                   (char_u *)&p_pdev, PV_NONE,
  3616. ***************
  3617. *** 1898,1904 ****
  3618.                   (char_u *)NULL, PV_NONE,
  3619.                   {(char_u *)NULL, (char_u *)0L}
  3620.   #endif
  3621. !                 },
  3622.       {"printencoding", "penc", P_STRING|P_VI_DEF,
  3623.   #ifdef FEAT_POSTSCRIPT
  3624.                   (char_u *)&p_penc, PV_NONE,
  3625. --- 1912,1918 ----
  3626.                   (char_u *)NULL, PV_NONE,
  3627.                   {(char_u *)NULL, (char_u *)0L}
  3628.   #endif
  3629. !                 SCRIPTID_INIT},
  3630.       {"printencoding", "penc", P_STRING|P_VI_DEF,
  3631.   #ifdef FEAT_POSTSCRIPT
  3632.                   (char_u *)&p_penc, PV_NONE,
  3633. ***************
  3634. *** 1907,1913 ****
  3635.                   (char_u *)NULL, PV_NONE,
  3636.                   {(char_u *)NULL, (char_u *)0L}
  3637.   #endif
  3638. !                 },
  3639.       {"printexpr", "pexpr",  P_STRING|P_VI_DEF,
  3640.   #ifdef FEAT_POSTSCRIPT
  3641.                   (char_u *)&p_pexpr, PV_NONE,
  3642. --- 1921,1927 ----
  3643.                   (char_u *)NULL, PV_NONE,
  3644.                   {(char_u *)NULL, (char_u *)0L}
  3645.   #endif
  3646. !                 SCRIPTID_INIT},
  3647.       {"printexpr", "pexpr",  P_STRING|P_VI_DEF,
  3648.   #ifdef FEAT_POSTSCRIPT
  3649.                   (char_u *)&p_pexpr, PV_NONE,
  3650. ***************
  3651. *** 1916,1922 ****
  3652.                   (char_u *)NULL, PV_NONE,
  3653.                   {(char_u *)NULL, (char_u *)0L}
  3654.   #endif
  3655. !                 },
  3656.       {"printfont", "pfn",    P_STRING|P_VI_DEF,
  3657.   #ifdef FEAT_PRINTER
  3658.                   (char_u *)&p_pfn, PV_NONE,
  3659. --- 1930,1936 ----
  3660.                   (char_u *)NULL, PV_NONE,
  3661.                   {(char_u *)NULL, (char_u *)0L}
  3662.   #endif
  3663. !                 SCRIPTID_INIT},
  3664.       {"printfont", "pfn",    P_STRING|P_VI_DEF,
  3665.   #ifdef FEAT_PRINTER
  3666.                   (char_u *)&p_pfn, PV_NONE,
  3667. ***************
  3668. *** 1931,1937 ****
  3669.                   (char_u *)NULL, PV_NONE,
  3670.                   {(char_u *)NULL, (char_u *)0L}
  3671.   #endif
  3672. !                 },
  3673.       {"printheader", "pheader",  P_STRING|P_VI_DEF|P_GETTEXT,
  3674.   #ifdef FEAT_PRINTER
  3675.                   (char_u *)&p_header, PV_NONE,
  3676. --- 1945,1951 ----
  3677.                   (char_u *)NULL, PV_NONE,
  3678.                   {(char_u *)NULL, (char_u *)0L}
  3679.   #endif
  3680. !                 SCRIPTID_INIT},
  3681.       {"printheader", "pheader",  P_STRING|P_VI_DEF|P_GETTEXT,
  3682.   #ifdef FEAT_PRINTER
  3683.                   (char_u *)&p_header, PV_NONE,
  3684. ***************
  3685. *** 1940,1946 ****
  3686.                   (char_u *)NULL, PV_NONE,
  3687.                   {(char_u *)NULL, (char_u *)0L}
  3688.   #endif
  3689. !                 },
  3690.      {"printmbcharset", "pmbcs",  P_STRING|P_VI_DEF,
  3691.   #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE)
  3692.                   (char_u *)&p_pmcs, PV_NONE,
  3693. --- 1954,1960 ----
  3694.                   (char_u *)NULL, PV_NONE,
  3695.                   {(char_u *)NULL, (char_u *)0L}
  3696.   #endif
  3697. !                 SCRIPTID_INIT},
  3698.      {"printmbcharset", "pmbcs",  P_STRING|P_VI_DEF,
  3699.   #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE)
  3700.                   (char_u *)&p_pmcs, PV_NONE,
  3701. ***************
  3702. *** 1949,1955 ****
  3703.                   (char_u *)NULL, PV_NONE,
  3704.                   {(char_u *)NULL, (char_u *)0L}
  3705.   #endif
  3706. !                 },
  3707.       {"printmbfont", "pmbfn",  P_STRING|P_VI_DEF,
  3708.   #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE)
  3709.                   (char_u *)&p_pmfn, PV_NONE,
  3710. --- 1963,1969 ----
  3711.                   (char_u *)NULL, PV_NONE,
  3712.                   {(char_u *)NULL, (char_u *)0L}
  3713.   #endif
  3714. !                 SCRIPTID_INIT},
  3715.       {"printmbfont", "pmbfn",  P_STRING|P_VI_DEF,
  3716.   #if defined(FEAT_POSTSCRIPT) && defined(FEAT_MBYTE)
  3717.                   (char_u *)&p_pmfn, PV_NONE,
  3718. ***************
  3719. *** 1958,1964 ****
  3720.                   (char_u *)NULL, PV_NONE,
  3721.                   {(char_u *)NULL, (char_u *)0L}
  3722.   #endif
  3723. !                 },
  3724.       {"printoptions", "popt", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  3725.   #ifdef FEAT_PRINTER
  3726.                   (char_u *)&p_popt, PV_NONE,
  3727. --- 1972,1978 ----
  3728.                   (char_u *)NULL, PV_NONE,
  3729.                   {(char_u *)NULL, (char_u *)0L}
  3730.   #endif
  3731. !                 SCRIPTID_INIT},
  3732.       {"printoptions", "popt", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  3733.   #ifdef FEAT_PRINTER
  3734.                   (char_u *)&p_popt, PV_NONE,
  3735. ***************
  3736. *** 1967,1983 ****
  3737.                   (char_u *)NULL, PV_NONE,
  3738.                   {(char_u *)NULL, (char_u *)0L}
  3739.   #endif
  3740. !                 },
  3741.       {"prompt",        NULL,   P_BOOL|P_VI_DEF,
  3742.                   (char_u *)&p_prompt, PV_NONE,
  3743. !                 {(char_u *)TRUE, (char_u *)0L}},
  3744.       {"pumheight",   "ph",   P_NUM|P_VI_DEF,
  3745.   #ifdef FEAT_INS_EXPAND
  3746.                   (char_u *)&p_ph, PV_NONE,
  3747.   #else
  3748.                   (char_u *)NULL, PV_NONE,
  3749.   #endif
  3750. !                 {(char_u *)0L, (char_u *)0L}},
  3751.       {"quoteescape", "qe",   P_STRING|P_ALLOCED|P_VI_DEF,
  3752.   #ifdef FEAT_TEXTOBJ
  3753.                   (char_u *)&p_qe, PV_QE,
  3754. --- 1981,1997 ----
  3755.                   (char_u *)NULL, PV_NONE,
  3756.                   {(char_u *)NULL, (char_u *)0L}
  3757.   #endif
  3758. !                 SCRIPTID_INIT},
  3759.       {"prompt",        NULL,   P_BOOL|P_VI_DEF,
  3760.                   (char_u *)&p_prompt, PV_NONE,
  3761. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  3762.       {"pumheight",   "ph",   P_NUM|P_VI_DEF,
  3763.   #ifdef FEAT_INS_EXPAND
  3764.                   (char_u *)&p_ph, PV_NONE,
  3765.   #else
  3766.                   (char_u *)NULL, PV_NONE,
  3767.   #endif
  3768. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  3769.       {"quoteescape", "qe",   P_STRING|P_ALLOCED|P_VI_DEF,
  3770.   #ifdef FEAT_TEXTOBJ
  3771.                   (char_u *)&p_qe, PV_QE,
  3772. ***************
  3773. *** 1986,2032 ****
  3774.                   (char_u *)NULL, PV_NONE,
  3775.                   {(char_u *)NULL, (char_u *)0L}
  3776.   #endif
  3777. !                 },
  3778.       {"readonly",    "ro",   P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB,
  3779.                   (char_u *)&p_ro, PV_RO,
  3780. !                 {(char_u *)FALSE, (char_u *)0L}},
  3781.       {"redraw",        NULL,   P_BOOL|P_VI_DEF,
  3782.                   (char_u *)NULL, PV_NONE,
  3783. !                 {(char_u *)FALSE, (char_u *)0L}},
  3784.       {"redrawtime",  "rdt",  P_NUM|P_VI_DEF,
  3785.   #ifdef FEAT_RELTIME
  3786.                   (char_u *)&p_rdt, PV_NONE,
  3787.   #else
  3788.                   (char_u *)NULL, PV_NONE,
  3789.   #endif
  3790. !                 {(char_u *)2000L, (char_u *)0L}},
  3791.       {"remap",        NULL,   P_BOOL|P_VI_DEF,
  3792.                   (char_u *)&p_remap, PV_NONE,
  3793. !                 {(char_u *)TRUE, (char_u *)0L}},
  3794.       {"report",        NULL,   P_NUM|P_VI_DEF,
  3795.                   (char_u *)&p_report, PV_NONE,
  3796. !                 {(char_u *)2L, (char_u *)0L}},
  3797.       {"restorescreen", "rs", P_BOOL|P_VI_DEF,
  3798.   #ifdef WIN3264
  3799.                   (char_u *)&p_rs, PV_NONE,
  3800.   #else
  3801.                   (char_u *)NULL, PV_NONE,
  3802.   #endif
  3803. !                 {(char_u *)TRUE, (char_u *)0L}},
  3804.       {"revins",        "ri",   P_BOOL|P_VI_DEF|P_VIM,
  3805.   #ifdef FEAT_RIGHTLEFT
  3806.                   (char_u *)&p_ri, PV_NONE,
  3807.   #else
  3808.                   (char_u *)NULL, PV_NONE,
  3809.   #endif
  3810. !                 {(char_u *)FALSE, (char_u *)0L}},
  3811.       {"rightleft",   "rl",   P_BOOL|P_VI_DEF|P_RWIN,
  3812.   #ifdef FEAT_RIGHTLEFT
  3813.                   (char_u *)VAR_WIN, PV_RL,
  3814.   #else
  3815.                   (char_u *)NULL, PV_NONE,
  3816.   #endif
  3817. !                 {(char_u *)FALSE, (char_u *)0L}},
  3818.       {"rightleftcmd", "rlc", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN,
  3819.   #ifdef FEAT_RIGHTLEFT
  3820.                   (char_u *)VAR_WIN, PV_RLC,
  3821. --- 2000,2046 ----
  3822.                   (char_u *)NULL, PV_NONE,
  3823.                   {(char_u *)NULL, (char_u *)0L}
  3824.   #endif
  3825. !                 SCRIPTID_INIT},
  3826.       {"readonly",    "ro",   P_BOOL|P_VI_DEF|P_RSTAT|P_NOGLOB,
  3827.                   (char_u *)&p_ro, PV_RO,
  3828. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3829.       {"redraw",        NULL,   P_BOOL|P_VI_DEF,
  3830.                   (char_u *)NULL, PV_NONE,
  3831. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3832.       {"redrawtime",  "rdt",  P_NUM|P_VI_DEF,
  3833.   #ifdef FEAT_RELTIME
  3834.                   (char_u *)&p_rdt, PV_NONE,
  3835.   #else
  3836.                   (char_u *)NULL, PV_NONE,
  3837.   #endif
  3838. !                 {(char_u *)2000L, (char_u *)0L} SCRIPTID_INIT},
  3839.       {"remap",        NULL,   P_BOOL|P_VI_DEF,
  3840.                   (char_u *)&p_remap, PV_NONE,
  3841. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  3842.       {"report",        NULL,   P_NUM|P_VI_DEF,
  3843.                   (char_u *)&p_report, PV_NONE,
  3844. !                 {(char_u *)2L, (char_u *)0L} SCRIPTID_INIT},
  3845.       {"restorescreen", "rs", P_BOOL|P_VI_DEF,
  3846.   #ifdef WIN3264
  3847.                   (char_u *)&p_rs, PV_NONE,
  3848.   #else
  3849.                   (char_u *)NULL, PV_NONE,
  3850.   #endif
  3851. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  3852.       {"revins",        "ri",   P_BOOL|P_VI_DEF|P_VIM,
  3853.   #ifdef FEAT_RIGHTLEFT
  3854.                   (char_u *)&p_ri, PV_NONE,
  3855.   #else
  3856.                   (char_u *)NULL, PV_NONE,
  3857.   #endif
  3858. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3859.       {"rightleft",   "rl",   P_BOOL|P_VI_DEF|P_RWIN,
  3860.   #ifdef FEAT_RIGHTLEFT
  3861.                   (char_u *)VAR_WIN, PV_RL,
  3862.   #else
  3863.                   (char_u *)NULL, PV_NONE,
  3864.   #endif
  3865. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3866.       {"rightleftcmd", "rlc", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN,
  3867.   #ifdef FEAT_RIGHTLEFT
  3868.                   (char_u *)VAR_WIN, PV_RLC,
  3869. ***************
  3870. *** 2035,2074 ****
  3871.                   (char_u *)NULL, PV_NONE,
  3872.                   {(char_u *)NULL, (char_u *)0L}
  3873.   #endif
  3874. !                 },
  3875.       {"ruler",        "ru",   P_BOOL|P_VI_DEF|P_VIM|P_RSTAT,
  3876.   #ifdef FEAT_CMDL_INFO
  3877.                   (char_u *)&p_ru, PV_NONE,
  3878.   #else
  3879.                   (char_u *)NULL, PV_NONE,
  3880.   #endif
  3881. !                 {(char_u *)FALSE, (char_u *)0L}},
  3882.       {"rulerformat", "ruf",  P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT,
  3883.   #ifdef FEAT_STL_OPT
  3884.                   (char_u *)&p_ruf, PV_NONE,
  3885.   #else
  3886.                   (char_u *)NULL, PV_NONE,
  3887.   #endif
  3888. !                 {(char_u *)"", (char_u *)0L}},
  3889.       {"runtimepath", "rtp",  P_STRING|P_VI_DEF|P_EXPAND|P_COMMA|P_NODUP|P_SECURE,
  3890.                   (char_u *)&p_rtp, PV_NONE,
  3891. !                 {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L}},
  3892.       {"scroll",        "scr",  P_NUM|P_NO_MKRC|P_VI_DEF,
  3893.                   (char_u *)VAR_WIN, PV_SCROLL,
  3894. !                 {(char_u *)12L, (char_u *)0L}},
  3895.       {"scrollbind",  "scb",  P_BOOL|P_VI_DEF,
  3896.   #ifdef FEAT_SCROLLBIND
  3897.                   (char_u *)VAR_WIN, PV_SCBIND,
  3898.   #else
  3899.                   (char_u *)NULL, PV_NONE,
  3900.   #endif
  3901. !                 {(char_u *)FALSE, (char_u *)0L}},
  3902.       {"scrolljump",  "sj",   P_NUM|P_VI_DEF|P_VIM,
  3903.                   (char_u *)&p_sj, PV_NONE,
  3904. !                 {(char_u *)1L, (char_u *)0L}},
  3905.       {"scrolloff",   "so",   P_NUM|P_VI_DEF|P_VIM|P_RALL,
  3906.                   (char_u *)&p_so, PV_NONE,
  3907. !                 {(char_u *)0L, (char_u *)0L}},
  3908.       {"scrollopt",   "sbo",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  3909.   #ifdef FEAT_SCROLLBIND
  3910.                   (char_u *)&p_sbo, PV_NONE,
  3911. --- 2049,2089 ----
  3912.                   (char_u *)NULL, PV_NONE,
  3913.                   {(char_u *)NULL, (char_u *)0L}
  3914.   #endif
  3915. !                 SCRIPTID_INIT},
  3916.       {"ruler",        "ru",   P_BOOL|P_VI_DEF|P_VIM|P_RSTAT,
  3917.   #ifdef FEAT_CMDL_INFO
  3918.                   (char_u *)&p_ru, PV_NONE,
  3919.   #else
  3920.                   (char_u *)NULL, PV_NONE,
  3921.   #endif
  3922. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3923.       {"rulerformat", "ruf",  P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT,
  3924.   #ifdef FEAT_STL_OPT
  3925.                   (char_u *)&p_ruf, PV_NONE,
  3926.   #else
  3927.                   (char_u *)NULL, PV_NONE,
  3928.   #endif
  3929. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  3930.       {"runtimepath", "rtp",  P_STRING|P_VI_DEF|P_EXPAND|P_COMMA|P_NODUP|P_SECURE,
  3931.                   (char_u *)&p_rtp, PV_NONE,
  3932. !                 {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L}
  3933. !                 SCRIPTID_INIT},
  3934.       {"scroll",        "scr",  P_NUM|P_NO_MKRC|P_VI_DEF,
  3935.                   (char_u *)VAR_WIN, PV_SCROLL,
  3936. !                 {(char_u *)12L, (char_u *)0L} SCRIPTID_INIT},
  3937.       {"scrollbind",  "scb",  P_BOOL|P_VI_DEF,
  3938.   #ifdef FEAT_SCROLLBIND
  3939.                   (char_u *)VAR_WIN, PV_SCBIND,
  3940.   #else
  3941.                   (char_u *)NULL, PV_NONE,
  3942.   #endif
  3943. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3944.       {"scrolljump",  "sj",   P_NUM|P_VI_DEF|P_VIM,
  3945.                   (char_u *)&p_sj, PV_NONE,
  3946. !                 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
  3947.       {"scrolloff",   "so",   P_NUM|P_VI_DEF|P_VIM|P_RALL,
  3948.                   (char_u *)&p_so, PV_NONE,
  3949. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  3950.       {"scrollopt",   "sbo",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  3951.   #ifdef FEAT_SCROLLBIND
  3952.                   (char_u *)&p_sbo, PV_NONE,
  3953. ***************
  3954. *** 2077,2103 ****
  3955.                   (char_u *)NULL, PV_NONE,
  3956.                   {(char_u *)0L, (char_u *)0L}
  3957.   #endif
  3958. !                 },
  3959.       {"sections",    "sect", P_STRING|P_VI_DEF,
  3960.                   (char_u *)&p_sections, PV_NONE,
  3961. !                 {(char_u *)"SHNHH HUnhsh", (char_u *)0L}},
  3962.       {"secure",        NULL,   P_BOOL|P_VI_DEF|P_SECURE,
  3963.                   (char_u *)&p_secure, PV_NONE,
  3964. !                 {(char_u *)FALSE, (char_u *)0L}},
  3965.       {"selection",   "sel",  P_STRING|P_VI_DEF,
  3966.   #ifdef FEAT_VISUAL
  3967.                   (char_u *)&p_sel, PV_NONE,
  3968.   #else
  3969.                   (char_u *)NULL, PV_NONE,
  3970.   #endif
  3971. !                 {(char_u *)"inclusive", (char_u *)0L}},
  3972.       {"selectmode",  "slm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  3973.   #ifdef FEAT_VISUAL
  3974.                   (char_u *)&p_slm, PV_NONE,
  3975.   #else
  3976.                   (char_u *)NULL, PV_NONE,
  3977.   #endif
  3978. !                 {(char_u *)"", (char_u *)0L}},
  3979.       {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  3980.   #ifdef FEAT_SESSION
  3981.                   (char_u *)&p_ssop, PV_NONE,
  3982. --- 2092,2120 ----
  3983.                   (char_u *)NULL, PV_NONE,
  3984.                   {(char_u *)0L, (char_u *)0L}
  3985.   #endif
  3986. !                 SCRIPTID_INIT},
  3987.       {"sections",    "sect", P_STRING|P_VI_DEF,
  3988.                   (char_u *)&p_sections, PV_NONE,
  3989. !                 {(char_u *)"SHNHH HUnhsh", (char_u *)0L}
  3990. !                 SCRIPTID_INIT},
  3991.       {"secure",        NULL,   P_BOOL|P_VI_DEF|P_SECURE,
  3992.                   (char_u *)&p_secure, PV_NONE,
  3993. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  3994.       {"selection",   "sel",  P_STRING|P_VI_DEF,
  3995.   #ifdef FEAT_VISUAL
  3996.                   (char_u *)&p_sel, PV_NONE,
  3997.   #else
  3998.                   (char_u *)NULL, PV_NONE,
  3999.   #endif
  4000. !                 {(char_u *)"inclusive", (char_u *)0L}
  4001. !                 SCRIPTID_INIT},
  4002.       {"selectmode",  "slm",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  4003.   #ifdef FEAT_VISUAL
  4004.                   (char_u *)&p_slm, PV_NONE,
  4005.   #else
  4006.                   (char_u *)NULL, PV_NONE,
  4007.   #endif
  4008. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4009.       {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  4010.   #ifdef FEAT_SESSION
  4011.                   (char_u *)&p_ssop, PV_NONE,
  4012. ***************
  4013. *** 2107,2113 ****
  4014.                   (char_u *)NULL, PV_NONE,
  4015.                   {(char_u *)0L, (char_u *)0L}
  4016.   #endif
  4017. !                 },
  4018.       {"shell",        "sh",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  4019.                   (char_u *)&p_sh, PV_NONE,
  4020.                   {
  4021. --- 2124,2130 ----
  4022.                   (char_u *)NULL, PV_NONE,
  4023.                   {(char_u *)0L, (char_u *)0L}
  4024.   #endif
  4025. !                 SCRIPTID_INIT},
  4026.       {"shell",        "sh",   P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  4027.                   (char_u *)&p_sh, PV_NONE,
  4028.                   {
  4029. ***************
  4030. *** 2136,2142 ****
  4031.   #  endif
  4032.   # endif
  4033.   #endif /* VMS */
  4034. !                 (char_u *)0L}},
  4035.       {"shellcmdflag","shcf", P_STRING|P_VI_DEF|P_SECURE,
  4036.                   (char_u *)&p_shcf, PV_NONE,
  4037.                   {
  4038. --- 2153,2159 ----
  4039.   #  endif
  4040.   # endif
  4041.   #endif /* VMS */
  4042. !                 (char_u *)0L} SCRIPTID_INIT},
  4043.       {"shellcmdflag","shcf", P_STRING|P_VI_DEF|P_SECURE,
  4044.                   (char_u *)&p_shcf, PV_NONE,
  4045.                   {
  4046. ***************
  4047. *** 2149,2155 ****
  4048.                   (char_u *)"-c",
  4049.   # endif
  4050.   #endif
  4051. !                 (char_u *)0L}},
  4052.       {"shellpipe",   "sp",   P_STRING|P_VI_DEF|P_SECURE,
  4053.   #ifdef FEAT_QUICKFIX
  4054.                   (char_u *)&p_sp, PV_NONE,
  4055. --- 2166,2172 ----
  4056.                   (char_u *)"-c",
  4057.   # endif
  4058.   #endif
  4059. !                 (char_u *)0L} SCRIPTID_INIT},
  4060.       {"shellpipe",   "sp",   P_STRING|P_VI_DEF|P_SECURE,
  4061.   #ifdef FEAT_QUICKFIX
  4062.                   (char_u *)&p_sp, PV_NONE,
  4063. ***************
  4064. *** 2168,2197 ****
  4065.                   (char_u *)NULL, PV_NONE,
  4066.                   {(char_u *)0L, (char_u *)0L}
  4067.   #endif
  4068. !     },
  4069.       {"shellquote",  "shq",  P_STRING|P_VI_DEF|P_SECURE,
  4070.                   (char_u *)&p_shq, PV_NONE,
  4071. !                 {(char_u *)"", (char_u *)0L}},
  4072.       {"shellredir",  "srr",  P_STRING|P_VI_DEF|P_SECURE,
  4073.                   (char_u *)&p_srr, PV_NONE,
  4074. !                 {(char_u *)">", (char_u *)0L}},
  4075.       {"shellslash",  "ssl",   P_BOOL|P_VI_DEF,
  4076.   #ifdef BACKSLASH_IN_FILENAME
  4077.                   (char_u *)&p_ssl, PV_NONE,
  4078.   #else
  4079.                   (char_u *)NULL, PV_NONE,
  4080.   #endif
  4081. !                 {(char_u *)FALSE, (char_u *)0L}},
  4082.       {"shelltemp",   "stmp", P_BOOL,
  4083.                   (char_u *)&p_stmp, PV_NONE,
  4084. !                 {(char_u *)FALSE, (char_u *)TRUE}},
  4085.       {"shelltype",   "st",   P_NUM|P_VI_DEF,
  4086.   #ifdef AMIGA
  4087.                   (char_u *)&p_st, PV_NONE,
  4088.   #else
  4089.                   (char_u *)NULL, PV_NONE,
  4090.   #endif
  4091. !                 {(char_u *)0L, (char_u *)0L}},
  4092.       {"shellxquote", "sxq",  P_STRING|P_VI_DEF|P_SECURE,
  4093.                   (char_u *)&p_sxq, PV_NONE,
  4094.                   {
  4095. --- 2185,2214 ----
  4096.                   (char_u *)NULL, PV_NONE,
  4097.                   {(char_u *)0L, (char_u *)0L}
  4098.   #endif
  4099. !                 SCRIPTID_INIT},
  4100.       {"shellquote",  "shq",  P_STRING|P_VI_DEF|P_SECURE,
  4101.                   (char_u *)&p_shq, PV_NONE,
  4102. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4103.       {"shellredir",  "srr",  P_STRING|P_VI_DEF|P_SECURE,
  4104.                   (char_u *)&p_srr, PV_NONE,
  4105. !                 {(char_u *)">", (char_u *)0L} SCRIPTID_INIT},
  4106.       {"shellslash",  "ssl",   P_BOOL|P_VI_DEF,
  4107.   #ifdef BACKSLASH_IN_FILENAME
  4108.                   (char_u *)&p_ssl, PV_NONE,
  4109.   #else
  4110.                   (char_u *)NULL, PV_NONE,
  4111.   #endif
  4112. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4113.       {"shelltemp",   "stmp", P_BOOL,
  4114.                   (char_u *)&p_stmp, PV_NONE,
  4115. !                 {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
  4116.       {"shelltype",   "st",   P_NUM|P_VI_DEF,
  4117.   #ifdef AMIGA
  4118.                   (char_u *)&p_st, PV_NONE,
  4119.   #else
  4120.                   (char_u *)NULL, PV_NONE,
  4121.   #endif
  4122. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  4123.       {"shellxquote", "sxq",  P_STRING|P_VI_DEF|P_SECURE,
  4124.                   (char_u *)&p_sxq, PV_NONE,
  4125.                   {
  4126. ***************
  4127. *** 2200,2229 ****
  4128.   #else
  4129.                   (char_u *)"",
  4130.   #endif
  4131. !                 (char_u *)0L}},
  4132.       {"shiftround",  "sr",   P_BOOL|P_VI_DEF|P_VIM,
  4133.                   (char_u *)&p_sr, PV_NONE,
  4134. !                 {(char_u *)FALSE, (char_u *)0L}},
  4135.       {"shiftwidth",  "sw",   P_NUM|P_VI_DEF,
  4136.                   (char_u *)&p_sw, PV_SW,
  4137. !                 {(char_u *)8L, (char_u *)0L}},
  4138.       {"shortmess",   "shm",  P_STRING|P_VIM|P_FLAGLIST,
  4139.                   (char_u *)&p_shm, PV_NONE,
  4140. !                 {(char_u *)"", (char_u *)"filnxtToO"}},
  4141.       {"shortname",   "sn",   P_BOOL|P_VI_DEF,
  4142.   #ifdef SHORT_FNAME
  4143.                   (char_u *)NULL, PV_NONE,
  4144.   #else
  4145.                   (char_u *)&p_sn, PV_SN,
  4146.   #endif
  4147. !                 {(char_u *)FALSE, (char_u *)0L}},
  4148.       {"showbreak",   "sbr",  P_STRING|P_VI_DEF|P_RALL,
  4149.   #ifdef FEAT_LINEBREAK
  4150.                   (char_u *)&p_sbr, PV_NONE,
  4151.   #else
  4152.                   (char_u *)NULL, PV_NONE,
  4153.   #endif
  4154. !                 {(char_u *)"", (char_u *)0L}},
  4155.       {"showcmd",        "sc",   P_BOOL|P_VIM,
  4156.   #ifdef FEAT_CMDL_INFO
  4157.                   (char_u *)&p_sc, PV_NONE,
  4158. --- 2217,2247 ----
  4159.   #else
  4160.                   (char_u *)"",
  4161.   #endif
  4162. !                 (char_u *)0L} SCRIPTID_INIT},
  4163.       {"shiftround",  "sr",   P_BOOL|P_VI_DEF|P_VIM,
  4164.                   (char_u *)&p_sr, PV_NONE,
  4165. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4166.       {"shiftwidth",  "sw",   P_NUM|P_VI_DEF,
  4167.                   (char_u *)&p_sw, PV_SW,
  4168. !                 {(char_u *)8L, (char_u *)0L} SCRIPTID_INIT},
  4169.       {"shortmess",   "shm",  P_STRING|P_VIM|P_FLAGLIST,
  4170.                   (char_u *)&p_shm, PV_NONE,
  4171. !                 {(char_u *)"", (char_u *)"filnxtToO"}
  4172. !                 SCRIPTID_INIT},
  4173.       {"shortname",   "sn",   P_BOOL|P_VI_DEF,
  4174.   #ifdef SHORT_FNAME
  4175.                   (char_u *)NULL, PV_NONE,
  4176.   #else
  4177.                   (char_u *)&p_sn, PV_SN,
  4178.   #endif
  4179. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4180.       {"showbreak",   "sbr",  P_STRING|P_VI_DEF|P_RALL,
  4181.   #ifdef FEAT_LINEBREAK
  4182.                   (char_u *)&p_sbr, PV_NONE,
  4183.   #else
  4184.                   (char_u *)NULL, PV_NONE,
  4185.   #endif
  4186. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4187.       {"showcmd",        "sc",   P_BOOL|P_VIM,
  4188.   #ifdef FEAT_CMDL_INFO
  4189.                   (char_u *)&p_sc, PV_NONE,
  4190. ***************
  4191. *** 2236,2293 ****
  4192.   #else
  4193.                   (char_u *)TRUE
  4194.   #endif
  4195. !                 }},
  4196.       {"showfulltag", "sft",  P_BOOL|P_VI_DEF,
  4197.                   (char_u *)&p_sft, PV_NONE,
  4198. !                 {(char_u *)FALSE, (char_u *)0L}},
  4199.       {"showmatch",   "sm",   P_BOOL|P_VI_DEF,
  4200.                   (char_u *)&p_sm, PV_NONE,
  4201. !                 {(char_u *)FALSE, (char_u *)0L}},
  4202.       {"showmode",    "smd",  P_BOOL|P_VIM,
  4203.                   (char_u *)&p_smd, PV_NONE,
  4204. !                 {(char_u *)FALSE, (char_u *)TRUE}},
  4205.       {"showtabline", "stal", P_NUM|P_VI_DEF|P_RALL,
  4206.   #ifdef FEAT_WINDOWS
  4207.                   (char_u *)&p_stal, PV_NONE,
  4208.   #else
  4209.                   (char_u *)NULL, PV_NONE,
  4210.   #endif
  4211. !                 {(char_u *)1L, (char_u *)0L}},
  4212.       {"sidescroll",  "ss",   P_NUM|P_VI_DEF,
  4213.                   (char_u *)&p_ss, PV_NONE,
  4214. !                 {(char_u *)0L, (char_u *)0L}},
  4215.       {"sidescrolloff", "siso", P_NUM|P_VI_DEF|P_VIM|P_RBUF,
  4216.                   (char_u *)&p_siso, PV_NONE,
  4217. !                 {(char_u *)0L, (char_u *)0L}},
  4218.       {"slowopen",    "slow", P_BOOL|P_VI_DEF,
  4219.                   (char_u *)NULL, PV_NONE,
  4220. !                 {(char_u *)FALSE, (char_u *)0L}},
  4221.       {"smartcase",   "scs",  P_BOOL|P_VI_DEF|P_VIM,
  4222.                   (char_u *)&p_scs, PV_NONE,
  4223. !                 {(char_u *)FALSE, (char_u *)0L}},
  4224.       {"smartindent", "si",   P_BOOL|P_VI_DEF|P_VIM,
  4225.   #ifdef FEAT_SMARTINDENT
  4226.                   (char_u *)&p_si, PV_SI,
  4227.   #else
  4228.                   (char_u *)NULL, PV_NONE,
  4229.   #endif
  4230. !                 {(char_u *)FALSE, (char_u *)0L}},
  4231.       {"smarttab",    "sta",  P_BOOL|P_VI_DEF|P_VIM,
  4232.                   (char_u *)&p_sta, PV_NONE,
  4233. !                 {(char_u *)FALSE, (char_u *)0L}},
  4234.       {"softtabstop", "sts",  P_NUM|P_VI_DEF|P_VIM,
  4235.                   (char_u *)&p_sts, PV_STS,
  4236. !                 {(char_u *)0L, (char_u *)0L}},
  4237.       {"sourceany",   NULL,   P_BOOL|P_VI_DEF,
  4238.                   (char_u *)NULL, PV_NONE,
  4239. !                 {(char_u *)FALSE, (char_u *)0L}},
  4240.       {"spell",        NULL,   P_BOOL|P_VI_DEF|P_RWIN,
  4241.   #ifdef FEAT_SPELL
  4242.                   (char_u *)VAR_WIN, PV_SPELL,
  4243.   #else
  4244.                   (char_u *)NULL, PV_NONE,
  4245.   #endif
  4246. !                 {(char_u *)FALSE, (char_u *)0L}},
  4247.       {"spellcapcheck", "spc", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF,
  4248.   #ifdef FEAT_SPELL
  4249.                   (char_u *)&p_spc, PV_SPC,
  4250. --- 2254,2311 ----
  4251.   #else
  4252.                   (char_u *)TRUE
  4253.   #endif
  4254. !                 } SCRIPTID_INIT},
  4255.       {"showfulltag", "sft",  P_BOOL|P_VI_DEF,
  4256.                   (char_u *)&p_sft, PV_NONE,
  4257. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4258.       {"showmatch",   "sm",   P_BOOL|P_VI_DEF,
  4259.                   (char_u *)&p_sm, PV_NONE,
  4260. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4261.       {"showmode",    "smd",  P_BOOL|P_VIM,
  4262.                   (char_u *)&p_smd, PV_NONE,
  4263. !                 {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
  4264.       {"showtabline", "stal", P_NUM|P_VI_DEF|P_RALL,
  4265.   #ifdef FEAT_WINDOWS
  4266.                   (char_u *)&p_stal, PV_NONE,
  4267.   #else
  4268.                   (char_u *)NULL, PV_NONE,
  4269.   #endif
  4270. !                 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
  4271.       {"sidescroll",  "ss",   P_NUM|P_VI_DEF,
  4272.                   (char_u *)&p_ss, PV_NONE,
  4273. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  4274.       {"sidescrolloff", "siso", P_NUM|P_VI_DEF|P_VIM|P_RBUF,
  4275.                   (char_u *)&p_siso, PV_NONE,
  4276. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  4277.       {"slowopen",    "slow", P_BOOL|P_VI_DEF,
  4278.                   (char_u *)NULL, PV_NONE,
  4279. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4280.       {"smartcase",   "scs",  P_BOOL|P_VI_DEF|P_VIM,
  4281.                   (char_u *)&p_scs, PV_NONE,
  4282. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4283.       {"smartindent", "si",   P_BOOL|P_VI_DEF|P_VIM,
  4284.   #ifdef FEAT_SMARTINDENT
  4285.                   (char_u *)&p_si, PV_SI,
  4286.   #else
  4287.                   (char_u *)NULL, PV_NONE,
  4288.   #endif
  4289. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4290.       {"smarttab",    "sta",  P_BOOL|P_VI_DEF|P_VIM,
  4291.                   (char_u *)&p_sta, PV_NONE,
  4292. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4293.       {"softtabstop", "sts",  P_NUM|P_VI_DEF|P_VIM,
  4294.                   (char_u *)&p_sts, PV_STS,
  4295. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  4296.       {"sourceany",   NULL,   P_BOOL|P_VI_DEF,
  4297.                   (char_u *)NULL, PV_NONE,
  4298. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4299.       {"spell",        NULL,   P_BOOL|P_VI_DEF|P_RWIN,
  4300.   #ifdef FEAT_SPELL
  4301.                   (char_u *)VAR_WIN, PV_SPELL,
  4302.   #else
  4303.                   (char_u *)NULL, PV_NONE,
  4304.   #endif
  4305. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4306.       {"spellcapcheck", "spc", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF,
  4307.   #ifdef FEAT_SPELL
  4308.                   (char_u *)&p_spc, PV_SPC,
  4309. ***************
  4310. *** 2296,2302 ****
  4311.                   (char_u *)NULL, PV_NONE,
  4312.                   {(char_u *)0L, (char_u *)0L}
  4313.   #endif
  4314. !                 },
  4315.       {"spellfile",   "spf",  P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE|P_COMMA,
  4316.   #ifdef FEAT_SPELL
  4317.                   (char_u *)&p_spf, PV_SPF,
  4318. --- 2314,2320 ----
  4319.                   (char_u *)NULL, PV_NONE,
  4320.                   {(char_u *)0L, (char_u *)0L}
  4321.   #endif
  4322. !                 SCRIPTID_INIT},
  4323.       {"spellfile",   "spf",  P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE|P_COMMA,
  4324.   #ifdef FEAT_SPELL
  4325.                   (char_u *)&p_spf, PV_SPF,
  4326. ***************
  4327. *** 2305,2311 ****
  4328.                   (char_u *)NULL, PV_NONE,
  4329.                   {(char_u *)0L, (char_u *)0L}
  4330.   #endif
  4331. !                 },
  4332.       {"spelllang",   "spl",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_RBUF|P_EXPAND,
  4333.   #ifdef FEAT_SPELL
  4334.                   (char_u *)&p_spl, PV_SPL,
  4335. --- 2323,2329 ----
  4336.                   (char_u *)NULL, PV_NONE,
  4337.                   {(char_u *)0L, (char_u *)0L}
  4338.   #endif
  4339. !                 SCRIPTID_INIT},
  4340.       {"spelllang",   "spl",  P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_RBUF|P_EXPAND,
  4341.   #ifdef FEAT_SPELL
  4342.                   (char_u *)&p_spl, PV_SPL,
  4343. ***************
  4344. *** 2314,2320 ****
  4345.                   (char_u *)NULL, PV_NONE,
  4346.                   {(char_u *)0L, (char_u *)0L}
  4347.   #endif
  4348. !                 },
  4349.       {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_COMMA,
  4350.   #ifdef FEAT_SPELL
  4351.                   (char_u *)&p_sps, PV_NONE,
  4352. --- 2332,2338 ----
  4353.                   (char_u *)NULL, PV_NONE,
  4354.                   {(char_u *)0L, (char_u *)0L}
  4355.   #endif
  4356. !                 SCRIPTID_INIT},
  4357.       {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_COMMA,
  4358.   #ifdef FEAT_SPELL
  4359.                   (char_u *)&p_sps, PV_NONE,
  4360. ***************
  4361. *** 2323,2357 ****
  4362.                   (char_u *)NULL, PV_NONE,
  4363.                   {(char_u *)0L, (char_u *)0L}
  4364.   #endif
  4365. !     },
  4366.       {"splitbelow",  "sb",   P_BOOL|P_VI_DEF,
  4367.   #ifdef FEAT_WINDOWS
  4368.                   (char_u *)&p_sb, PV_NONE,
  4369.   #else
  4370.                   (char_u *)NULL, PV_NONE,
  4371.   #endif
  4372. !                 {(char_u *)FALSE, (char_u *)0L}},
  4373.       {"splitright",  "spr",  P_BOOL|P_VI_DEF,
  4374.   #ifdef FEAT_VERTSPLIT
  4375.                   (char_u *)&p_spr, PV_NONE,
  4376.   #else
  4377.                   (char_u *)NULL, PV_NONE,
  4378.   #endif
  4379. !                 {(char_u *)FALSE, (char_u *)0L}},
  4380.       {"startofline", "sol",  P_BOOL|P_VI_DEF|P_VIM,
  4381.                   (char_u *)&p_sol, PV_NONE,
  4382. !                 {(char_u *)TRUE, (char_u *)0L}},
  4383.       {"statusline"  ,"stl",  P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT,
  4384.   #ifdef FEAT_STL_OPT
  4385.                   (char_u *)&p_stl, PV_STL,
  4386.   #else
  4387.                   (char_u *)NULL, PV_NONE,
  4388.   #endif
  4389. !                 {(char_u *)"", (char_u *)0L}},
  4390.       {"suffixes",    "su",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  4391.                   (char_u *)&p_su, PV_NONE,
  4392.                   {(char_u *)".bak,~,.o,.h,.info,.swp,.obj",
  4393. !                 (char_u *)0L}},
  4394.       {"suffixesadd", "sua",  P_STRING|P_VI_DEF|P_ALLOCED|P_COMMA|P_NODUP,
  4395.   #ifdef FEAT_SEARCHPATH
  4396.                   (char_u *)&p_sua, PV_SUA,
  4397. --- 2341,2375 ----
  4398.                   (char_u *)NULL, PV_NONE,
  4399.                   {(char_u *)0L, (char_u *)0L}
  4400.   #endif
  4401. !                 SCRIPTID_INIT},
  4402.       {"splitbelow",  "sb",   P_BOOL|P_VI_DEF,
  4403.   #ifdef FEAT_WINDOWS
  4404.                   (char_u *)&p_sb, PV_NONE,
  4405.   #else
  4406.                   (char_u *)NULL, PV_NONE,
  4407.   #endif
  4408. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4409.       {"splitright",  "spr",  P_BOOL|P_VI_DEF,
  4410.   #ifdef FEAT_VERTSPLIT
  4411.                   (char_u *)&p_spr, PV_NONE,
  4412.   #else
  4413.                   (char_u *)NULL, PV_NONE,
  4414.   #endif
  4415. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4416.       {"startofline", "sol",  P_BOOL|P_VI_DEF|P_VIM,
  4417.                   (char_u *)&p_sol, PV_NONE,
  4418. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  4419.       {"statusline"  ,"stl",  P_STRING|P_VI_DEF|P_ALLOCED|P_RSTAT,
  4420.   #ifdef FEAT_STL_OPT
  4421.                   (char_u *)&p_stl, PV_STL,
  4422.   #else
  4423.                   (char_u *)NULL, PV_NONE,
  4424.   #endif
  4425. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4426.       {"suffixes",    "su",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  4427.                   (char_u *)&p_su, PV_NONE,
  4428.                   {(char_u *)".bak,~,.o,.h,.info,.swp,.obj",
  4429. !                 (char_u *)0L} SCRIPTID_INIT},
  4430.       {"suffixesadd", "sua",  P_STRING|P_VI_DEF|P_ALLOCED|P_COMMA|P_NODUP,
  4431.   #ifdef FEAT_SEARCHPATH
  4432.                   (char_u *)&p_sua, PV_SUA,
  4433. ***************
  4434. *** 2360,2375 ****
  4435.                   (char_u *)NULL, PV_NONE,
  4436.                   {(char_u *)0L, (char_u *)0L}
  4437.   #endif
  4438. !                 },
  4439.       {"swapfile",    "swf",  P_BOOL|P_VI_DEF|P_RSTAT,
  4440.                   (char_u *)&p_swf, PV_SWF,
  4441. !                 {(char_u *)TRUE, (char_u *)0L}},
  4442.       {"swapsync",    "sws",  P_STRING|P_VI_DEF,
  4443.                   (char_u *)&p_sws, PV_NONE,
  4444. !                 {(char_u *)"fsync", (char_u *)0L}},
  4445.       {"switchbuf",   "swb",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  4446.                   (char_u *)&p_swb, PV_NONE,
  4447. !                 {(char_u *)"", (char_u *)0L}},
  4448.       {"synmaxcol",   "smc",  P_NUM|P_VI_DEF|P_RBUF,
  4449.   #ifdef FEAT_SYN_HL
  4450.                   (char_u *)&p_smc, PV_SMC,
  4451. --- 2378,2393 ----
  4452.                   (char_u *)NULL, PV_NONE,
  4453.                   {(char_u *)0L, (char_u *)0L}
  4454.   #endif
  4455. !                 SCRIPTID_INIT},
  4456.       {"swapfile",    "swf",  P_BOOL|P_VI_DEF|P_RSTAT,
  4457.                   (char_u *)&p_swf, PV_SWF,
  4458. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  4459.       {"swapsync",    "sws",  P_STRING|P_VI_DEF,
  4460.                   (char_u *)&p_sws, PV_NONE,
  4461. !                 {(char_u *)"fsync", (char_u *)0L} SCRIPTID_INIT},
  4462.       {"switchbuf",   "swb",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  4463.                   (char_u *)&p_swb, PV_NONE,
  4464. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4465.       {"synmaxcol",   "smc",  P_NUM|P_VI_DEF|P_RBUF,
  4466.   #ifdef FEAT_SYN_HL
  4467.                   (char_u *)&p_smc, PV_SMC,
  4468. ***************
  4469. *** 2378,2384 ****
  4470.                   (char_u *)NULL, PV_NONE,
  4471.                   {(char_u *)0L, (char_u *)0L}
  4472.   #endif
  4473. !                 },
  4474.       {"syntax",        "syn",  P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
  4475.   #ifdef FEAT_SYN_HL
  4476.                   (char_u *)&p_syn, PV_SYN,
  4477. --- 2396,2402 ----
  4478.                   (char_u *)NULL, PV_NONE,
  4479.                   {(char_u *)0L, (char_u *)0L}
  4480.   #endif
  4481. !                 SCRIPTID_INIT},
  4482.       {"syntax",        "syn",  P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
  4483.   #ifdef FEAT_SYN_HL
  4484.                   (char_u *)&p_syn, PV_SYN,
  4485. ***************
  4486. *** 2387,2410 ****
  4487.                   (char_u *)NULL, PV_NONE,
  4488.                   {(char_u *)0L, (char_u *)0L}
  4489.   #endif
  4490. !                 },
  4491.       {"tabline",        "tal",  P_STRING|P_VI_DEF|P_RALL,
  4492.   #ifdef FEAT_STL_OPT
  4493.                   (char_u *)&p_tal, PV_NONE,
  4494.   #else
  4495.                   (char_u *)NULL, PV_NONE,
  4496.   #endif
  4497. !                 {(char_u *)"", (char_u *)0L}},
  4498.       {"tabpagemax",  "tpm",  P_NUM|P_VI_DEF,
  4499.   #ifdef FEAT_WINDOWS
  4500.                   (char_u *)&p_tpm, PV_NONE,
  4501.   #else
  4502.                   (char_u *)NULL, PV_NONE,
  4503.   #endif
  4504. !                 {(char_u *)10L, (char_u *)0L}},
  4505.       {"tabstop",        "ts",   P_NUM|P_VI_DEF|P_RBUF,
  4506.                   (char_u *)&p_ts, PV_TS,
  4507. !                 {(char_u *)8L, (char_u *)0L}},
  4508.       {"tagbsearch",  "tbs",   P_BOOL|P_VI_DEF,
  4509.                   (char_u *)&p_tbs, PV_NONE,
  4510.   #ifdef VMS    /* binary searching doesn't appear to work on VMS */
  4511. --- 2405,2428 ----
  4512.                   (char_u *)NULL, PV_NONE,
  4513.                   {(char_u *)0L, (char_u *)0L}
  4514.   #endif
  4515. !                 SCRIPTID_INIT},
  4516.       {"tabline",        "tal",  P_STRING|P_VI_DEF|P_RALL,
  4517.   #ifdef FEAT_STL_OPT
  4518.                   (char_u *)&p_tal, PV_NONE,
  4519.   #else
  4520.                   (char_u *)NULL, PV_NONE,
  4521.   #endif
  4522. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4523.       {"tabpagemax",  "tpm",  P_NUM|P_VI_DEF,
  4524.   #ifdef FEAT_WINDOWS
  4525.                   (char_u *)&p_tpm, PV_NONE,
  4526.   #else
  4527.                   (char_u *)NULL, PV_NONE,
  4528.   #endif
  4529. !                 {(char_u *)10L, (char_u *)0L} SCRIPTID_INIT},
  4530.       {"tabstop",        "ts",   P_NUM|P_VI_DEF|P_RBUF,
  4531.                   (char_u *)&p_ts, PV_TS,
  4532. !                 {(char_u *)8L, (char_u *)0L} SCRIPTID_INIT},
  4533.       {"tagbsearch",  "tbs",   P_BOOL|P_VI_DEF,
  4534.                   (char_u *)&p_tbs, PV_NONE,
  4535.   #ifdef VMS    /* binary searching doesn't appear to work on VMS */
  4536. ***************
  4537. *** 2412,2424 ****
  4538.   #else
  4539.                   {(char_u *)TRUE, (char_u *)0L}
  4540.   #endif
  4541. !                 },
  4542.       {"taglength",   "tl",   P_NUM|P_VI_DEF,
  4543.                   (char_u *)&p_tl, PV_NONE,
  4544. !                 {(char_u *)0L, (char_u *)0L}},
  4545.       {"tagrelative", "tr",   P_BOOL|P_VIM,
  4546.                   (char_u *)&p_tr, PV_NONE,
  4547. !                 {(char_u *)FALSE, (char_u *)TRUE}},
  4548.       {"tags",        "tag",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
  4549.                   (char_u *)&p_tags, PV_TAGS,
  4550.                   {
  4551. --- 2430,2442 ----
  4552.   #else
  4553.                   {(char_u *)TRUE, (char_u *)0L}
  4554.   #endif
  4555. !                 SCRIPTID_INIT},
  4556.       {"taglength",   "tl",   P_NUM|P_VI_DEF,
  4557.                   (char_u *)&p_tl, PV_NONE,
  4558. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  4559.       {"tagrelative", "tr",   P_BOOL|P_VIM,
  4560.                   (char_u *)&p_tr, PV_NONE,
  4561. !                 {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
  4562.       {"tags",        "tag",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
  4563.                   (char_u *)&p_tags, PV_TAGS,
  4564.                   {
  4565. ***************
  4566. *** 2427,2446 ****
  4567.   #else
  4568.                   (char_u *)"./tags,tags",
  4569.   #endif
  4570. !                 (char_u *)0L}},
  4571.       {"tagstack",    "tgst", P_BOOL|P_VI_DEF,
  4572.                   (char_u *)&p_tgst, PV_NONE,
  4573. !                 {(char_u *)TRUE, (char_u *)0L}},
  4574.       {"term",        NULL,   P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
  4575.                   (char_u *)&T_NAME, PV_NONE,
  4576. !                 {(char_u *)"", (char_u *)0L}},
  4577.       {"termbidi", "tbidi",   P_BOOL|P_VI_DEF,
  4578.   #ifdef FEAT_ARABIC
  4579.                   (char_u *)&p_tbidi, PV_NONE,
  4580.   #else
  4581.                   (char_u *)NULL, PV_NONE,
  4582.   #endif
  4583. !                 {(char_u *)FALSE, (char_u *)0L}},
  4584.       {"termencoding", "tenc", P_STRING|P_VI_DEF|P_RCLR,
  4585.   #ifdef FEAT_MBYTE
  4586.                   (char_u *)&p_tenc, PV_NONE,
  4587. --- 2445,2464 ----
  4588.   #else
  4589.                   (char_u *)"./tags,tags",
  4590.   #endif
  4591. !                 (char_u *)0L} SCRIPTID_INIT},
  4592.       {"tagstack",    "tgst", P_BOOL|P_VI_DEF,
  4593.                   (char_u *)&p_tgst, PV_NONE,
  4594. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  4595.       {"term",        NULL,   P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
  4596.                   (char_u *)&T_NAME, PV_NONE,
  4597. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4598.       {"termbidi", "tbidi",   P_BOOL|P_VI_DEF,
  4599.   #ifdef FEAT_ARABIC
  4600.                   (char_u *)&p_tbidi, PV_NONE,
  4601.   #else
  4602.                   (char_u *)NULL, PV_NONE,
  4603.   #endif
  4604. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4605.       {"termencoding", "tenc", P_STRING|P_VI_DEF|P_RCLR,
  4606.   #ifdef FEAT_MBYTE
  4607.                   (char_u *)&p_tenc, PV_NONE,
  4608. ***************
  4609. *** 2449,2461 ****
  4610.                   (char_u *)NULL, PV_NONE,
  4611.                   {(char_u *)0L, (char_u *)0L}
  4612.   #endif
  4613. !                 },
  4614.       {"terse",        NULL,   P_BOOL|P_VI_DEF,
  4615.                   (char_u *)&p_terse, PV_NONE,
  4616. !                 {(char_u *)FALSE, (char_u *)0L}},
  4617.       {"textauto",    "ta",   P_BOOL|P_VIM,
  4618.                   (char_u *)&p_ta, PV_NONE,
  4619. !                 {(char_u *)DFLT_TEXTAUTO, (char_u *)TRUE}},
  4620.       {"textmode",    "tx",   P_BOOL|P_VI_DEF|P_NO_MKRC,
  4621.                   (char_u *)&p_tx, PV_TX,
  4622.                   {
  4623. --- 2467,2480 ----
  4624.                   (char_u *)NULL, PV_NONE,
  4625.                   {(char_u *)0L, (char_u *)0L}
  4626.   #endif
  4627. !                 SCRIPTID_INIT},
  4628.       {"terse",        NULL,   P_BOOL|P_VI_DEF,
  4629.                   (char_u *)&p_terse, PV_NONE,
  4630. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4631.       {"textauto",    "ta",   P_BOOL|P_VIM,
  4632.                   (char_u *)&p_ta, PV_NONE,
  4633. !                 {(char_u *)DFLT_TEXTAUTO, (char_u *)TRUE}
  4634. !                 SCRIPTID_INIT},
  4635.       {"textmode",    "tx",   P_BOOL|P_VI_DEF|P_NO_MKRC,
  4636.                   (char_u *)&p_tx, PV_TX,
  4637.                   {
  4638. ***************
  4639. *** 2464,2503 ****
  4640.   #else
  4641.                   (char_u *)FALSE,
  4642.   #endif
  4643. !                 (char_u *)0L}},
  4644.       {"textwidth",   "tw",   P_NUM|P_VI_DEF|P_VIM,
  4645.                   (char_u *)&p_tw, PV_TW,
  4646. !                 {(char_u *)0L, (char_u *)0L}},
  4647.       {"thesaurus",   "tsr",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
  4648.   #ifdef FEAT_INS_EXPAND
  4649.                   (char_u *)&p_tsr, PV_TSR,
  4650.   #else
  4651.                   (char_u *)NULL, PV_NONE,
  4652.   #endif
  4653. !                 {(char_u *)"", (char_u *)0L}},
  4654.       {"tildeop",        "top",  P_BOOL|P_VI_DEF|P_VIM,
  4655.                   (char_u *)&p_to, PV_NONE,
  4656. !                 {(char_u *)FALSE, (char_u *)0L}},
  4657.       {"timeout",        "to",   P_BOOL|P_VI_DEF,
  4658.                   (char_u *)&p_timeout, PV_NONE,
  4659. !                 {(char_u *)TRUE, (char_u *)0L}},
  4660.       {"timeoutlen",  "tm",   P_NUM|P_VI_DEF,
  4661.                   (char_u *)&p_tm, PV_NONE,
  4662. !                 {(char_u *)1000L, (char_u *)0L}},
  4663.       {"title",        NULL,   P_BOOL|P_VI_DEF,
  4664.   #ifdef FEAT_TITLE
  4665.                   (char_u *)&p_title, PV_NONE,
  4666.   #else
  4667.                   (char_u *)NULL, PV_NONE,
  4668.   #endif
  4669. !                 {(char_u *)FALSE, (char_u *)0L}},
  4670.       {"titlelen",    NULL,   P_NUM|P_VI_DEF,
  4671.   #ifdef FEAT_TITLE
  4672.                   (char_u *)&p_titlelen, PV_NONE,
  4673.   #else
  4674.                   (char_u *)NULL, PV_NONE,
  4675.   #endif
  4676. !                 {(char_u *)85L, (char_u *)0L}},
  4677.       {"titleold",    NULL,   P_STRING|P_VI_DEF|P_GETTEXT|P_SECURE|P_NO_MKRC,
  4678.   #ifdef FEAT_TITLE
  4679.                   (char_u *)&p_titleold, PV_NONE,
  4680. --- 2483,2522 ----
  4681.   #else
  4682.                   (char_u *)FALSE,
  4683.   #endif
  4684. !                 (char_u *)0L} SCRIPTID_INIT},
  4685.       {"textwidth",   "tw",   P_NUM|P_VI_DEF|P_VIM,
  4686.                   (char_u *)&p_tw, PV_TW,
  4687. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  4688.       {"thesaurus",   "tsr",  P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
  4689.   #ifdef FEAT_INS_EXPAND
  4690.                   (char_u *)&p_tsr, PV_TSR,
  4691.   #else
  4692.                   (char_u *)NULL, PV_NONE,
  4693.   #endif
  4694. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4695.       {"tildeop",        "top",  P_BOOL|P_VI_DEF|P_VIM,
  4696.                   (char_u *)&p_to, PV_NONE,
  4697. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4698.       {"timeout",        "to",   P_BOOL|P_VI_DEF,
  4699.                   (char_u *)&p_timeout, PV_NONE,
  4700. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  4701.       {"timeoutlen",  "tm",   P_NUM|P_VI_DEF,
  4702.                   (char_u *)&p_tm, PV_NONE,
  4703. !                 {(char_u *)1000L, (char_u *)0L} SCRIPTID_INIT},
  4704.       {"title",        NULL,   P_BOOL|P_VI_DEF,
  4705.   #ifdef FEAT_TITLE
  4706.                   (char_u *)&p_title, PV_NONE,
  4707.   #else
  4708.                   (char_u *)NULL, PV_NONE,
  4709.   #endif
  4710. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4711.       {"titlelen",    NULL,   P_NUM|P_VI_DEF,
  4712.   #ifdef FEAT_TITLE
  4713.                   (char_u *)&p_titlelen, PV_NONE,
  4714.   #else
  4715.                   (char_u *)NULL, PV_NONE,
  4716.   #endif
  4717. !                 {(char_u *)85L, (char_u *)0L} SCRIPTID_INIT},
  4718.       {"titleold",    NULL,   P_STRING|P_VI_DEF|P_GETTEXT|P_SECURE|P_NO_MKRC,
  4719.   #ifdef FEAT_TITLE
  4720.                   (char_u *)&p_titleold, PV_NONE,
  4721. ***************
  4722. *** 2507,2555 ****
  4723.                   (char_u *)NULL, PV_NONE,
  4724.                   {(char_u *)0L, (char_u *)0L}
  4725.   #endif
  4726. !                 },
  4727.       {"titlestring", NULL,   P_STRING|P_VI_DEF,
  4728.   #ifdef FEAT_TITLE
  4729.                   (char_u *)&p_titlestring, PV_NONE,
  4730.   #else
  4731.                   (char_u *)NULL, PV_NONE,
  4732.   #endif
  4733. !                 {(char_u *)"", (char_u *)0L}},
  4734.   #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
  4735.       {"toolbar",     "tb",   P_STRING|P_COMMA|P_VI_DEF|P_NODUP,
  4736.                   (char_u *)&p_toolbar, PV_NONE,
  4737. !                 {(char_u *)"icons,tooltips", (char_u *)0L}},
  4738.   #endif
  4739.   #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) && defined(HAVE_GTK2)
  4740.       {"toolbariconsize",    "tbis", P_STRING|P_VI_DEF,
  4741.                   (char_u *)&p_tbis, PV_NONE,
  4742. !                 {(char_u *)"small", (char_u *)0L}},
  4743.   #endif
  4744.       {"ttimeout",    NULL,   P_BOOL|P_VI_DEF|P_VIM,
  4745.                   (char_u *)&p_ttimeout, PV_NONE,
  4746. !                 {(char_u *)FALSE, (char_u *)0L}},
  4747.       {"ttimeoutlen", "ttm",  P_NUM|P_VI_DEF,
  4748.                   (char_u *)&p_ttm, PV_NONE,
  4749. !                 {(char_u *)-1L, (char_u *)0L}},
  4750.       {"ttybuiltin",  "tbi",  P_BOOL|P_VI_DEF,
  4751.                   (char_u *)&p_tbi, PV_NONE,
  4752. !                 {(char_u *)TRUE, (char_u *)0L}},
  4753.       {"ttyfast",        "tf",   P_BOOL|P_NO_MKRC|P_VI_DEF,
  4754.                   (char_u *)&p_tf, PV_NONE,
  4755. !                 {(char_u *)FALSE, (char_u *)0L}},
  4756.       {"ttymouse",    "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF,
  4757.   #if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS))
  4758.                   (char_u *)&p_ttym, PV_NONE,
  4759.   #else
  4760.                   (char_u *)NULL, PV_NONE,
  4761.   #endif
  4762. !                 {(char_u *)"", (char_u *)0L}},
  4763.       {"ttyscroll",   "tsl",  P_NUM|P_VI_DEF,
  4764.                   (char_u *)&p_ttyscroll, PV_NONE,
  4765. !                 {(char_u *)999L, (char_u *)0L}},
  4766.       {"ttytype",        "tty",  P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
  4767.                   (char_u *)&T_NAME, PV_NONE,
  4768. !                 {(char_u *)"", (char_u *)0L}},
  4769.       {"undolevels",  "ul",   P_NUM|P_VI_DEF,
  4770.                   (char_u *)&p_ul, PV_NONE,
  4771.                   {
  4772. --- 2526,2575 ----
  4773.                   (char_u *)NULL, PV_NONE,
  4774.                   {(char_u *)0L, (char_u *)0L}
  4775.   #endif
  4776. !                 SCRIPTID_INIT},
  4777.       {"titlestring", NULL,   P_STRING|P_VI_DEF,
  4778.   #ifdef FEAT_TITLE
  4779.                   (char_u *)&p_titlestring, PV_NONE,
  4780.   #else
  4781.                   (char_u *)NULL, PV_NONE,
  4782.   #endif
  4783. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4784.   #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
  4785.       {"toolbar",     "tb",   P_STRING|P_COMMA|P_VI_DEF|P_NODUP,
  4786.                   (char_u *)&p_toolbar, PV_NONE,
  4787. !                 {(char_u *)"icons,tooltips", (char_u *)0L}
  4788. !                 SCRIPTID_INIT},
  4789.   #endif
  4790.   #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) && defined(HAVE_GTK2)
  4791.       {"toolbariconsize",    "tbis", P_STRING|P_VI_DEF,
  4792.                   (char_u *)&p_tbis, PV_NONE,
  4793. !                 {(char_u *)"small", (char_u *)0L} SCRIPTID_INIT},
  4794.   #endif
  4795.       {"ttimeout",    NULL,   P_BOOL|P_VI_DEF|P_VIM,
  4796.                   (char_u *)&p_ttimeout, PV_NONE,
  4797. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4798.       {"ttimeoutlen", "ttm",  P_NUM|P_VI_DEF,
  4799.                   (char_u *)&p_ttm, PV_NONE,
  4800. !                 {(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT},
  4801.       {"ttybuiltin",  "tbi",  P_BOOL|P_VI_DEF,
  4802.                   (char_u *)&p_tbi, PV_NONE,
  4803. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  4804.       {"ttyfast",        "tf",   P_BOOL|P_NO_MKRC|P_VI_DEF,
  4805.                   (char_u *)&p_tf, PV_NONE,
  4806. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4807.       {"ttymouse",    "ttym", P_STRING|P_NODEFAULT|P_NO_MKRC|P_VI_DEF,
  4808.   #if defined(FEAT_MOUSE) && (defined(UNIX) || defined(VMS))
  4809.                   (char_u *)&p_ttym, PV_NONE,
  4810.   #else
  4811.                   (char_u *)NULL, PV_NONE,
  4812.   #endif
  4813. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4814.       {"ttyscroll",   "tsl",  P_NUM|P_VI_DEF,
  4815.                   (char_u *)&p_ttyscroll, PV_NONE,
  4816. !                 {(char_u *)999L, (char_u *)0L} SCRIPTID_INIT},
  4817.       {"ttytype",        "tty",  P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
  4818.                   (char_u *)&T_NAME, PV_NONE,
  4819. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4820.       {"undolevels",  "ul",   P_NUM|P_VI_DEF,
  4821.                   (char_u *)&p_ul, PV_NONE,
  4822.                   {
  4823. ***************
  4824. *** 2558,2576 ****
  4825.   #else
  4826.                   (char_u *)100L,
  4827.   #endif
  4828. !                 (char_u *)0L}},
  4829.       {"updatecount", "uc",   P_NUM|P_VI_DEF,
  4830.                   (char_u *)&p_uc, PV_NONE,
  4831. !                 {(char_u *)200L, (char_u *)0L}},
  4832.       {"updatetime",  "ut",   P_NUM|P_VI_DEF,
  4833.                   (char_u *)&p_ut, PV_NONE,
  4834. !                 {(char_u *)4000L, (char_u *)0L}},
  4835.       {"verbose",        "vbs",  P_NUM|P_VI_DEF,
  4836.                   (char_u *)&p_verbose, PV_NONE,
  4837. !                 {(char_u *)0L, (char_u *)0L}},
  4838.       {"verbosefile", "vfile", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  4839.                   (char_u *)&p_vfile, PV_NONE,
  4840. !                 {(char_u *)"", (char_u *)0L}},
  4841.       {"viewdir",     "vdir", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  4842.   #ifdef FEAT_SESSION
  4843.                   (char_u *)&p_vdir, PV_NONE,
  4844. --- 2578,2596 ----
  4845.   #else
  4846.                   (char_u *)100L,
  4847.   #endif
  4848. !                 (char_u *)0L} SCRIPTID_INIT},
  4849.       {"updatecount", "uc",   P_NUM|P_VI_DEF,
  4850.                   (char_u *)&p_uc, PV_NONE,
  4851. !                 {(char_u *)200L, (char_u *)0L} SCRIPTID_INIT},
  4852.       {"updatetime",  "ut",   P_NUM|P_VI_DEF,
  4853.                   (char_u *)&p_ut, PV_NONE,
  4854. !                 {(char_u *)4000L, (char_u *)0L} SCRIPTID_INIT},
  4855.       {"verbose",        "vbs",  P_NUM|P_VI_DEF,
  4856.                   (char_u *)&p_verbose, PV_NONE,
  4857. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  4858.       {"verbosefile", "vfile", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  4859.                   (char_u *)&p_vfile, PV_NONE,
  4860. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  4861.       {"viewdir",     "vdir", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
  4862.   #ifdef FEAT_SESSION
  4863.                   (char_u *)&p_vdir, PV_NONE,
  4864. ***************
  4865. *** 2579,2585 ****
  4866.                   (char_u *)NULL, PV_NONE,
  4867.                   {(char_u *)0L, (char_u *)0L}
  4868.   #endif
  4869. !                 },
  4870.       {"viewoptions", "vop",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  4871.   #ifdef FEAT_SESSION
  4872.                   (char_u *)&p_vop, PV_NONE,
  4873. --- 2599,2605 ----
  4874.                   (char_u *)NULL, PV_NONE,
  4875.                   {(char_u *)0L, (char_u *)0L}
  4876.   #endif
  4877. !                 SCRIPTID_INIT},
  4878.       {"viewoptions", "vop",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  4879.   #ifdef FEAT_SESSION
  4880.                   (char_u *)&p_vop, PV_NONE,
  4881. ***************
  4882. *** 2588,2594 ****
  4883.                   (char_u *)NULL, PV_NONE,
  4884.                   {(char_u *)0L, (char_u *)0L}
  4885.   #endif
  4886. !                 },
  4887.       {"viminfo",        "vi",   P_STRING|P_COMMA|P_NODUP|P_SECURE,
  4888.   #ifdef FEAT_VIMINFO
  4889.                   (char_u *)&p_viminfo, PV_NONE,
  4890. --- 2608,2614 ----
  4891.                   (char_u *)NULL, PV_NONE,
  4892.                   {(char_u *)0L, (char_u *)0L}
  4893.   #endif
  4894. !                 SCRIPTID_INIT},
  4895.       {"viminfo",        "vi",   P_STRING|P_COMMA|P_NODUP|P_SECURE,
  4896.   #ifdef FEAT_VIMINFO
  4897.                   (char_u *)&p_viminfo, PV_NONE,
  4898. ***************
  4899. *** 2606,2612 ****
  4900.                   (char_u *)NULL, PV_NONE,
  4901.                   {(char_u *)0L, (char_u *)0L}
  4902.   #endif
  4903. !                 },
  4904.       {"virtualedit", "ve",   P_STRING|P_COMMA|P_NODUP|P_VI_DEF|P_VIM,
  4905.   #ifdef FEAT_VIRTUALEDIT
  4906.                   (char_u *)&p_ve, PV_NONE,
  4907. --- 2626,2632 ----
  4908.                   (char_u *)NULL, PV_NONE,
  4909.                   {(char_u *)0L, (char_u *)0L}
  4910.   #endif
  4911. !                 SCRIPTID_INIT},
  4912.       {"virtualedit", "ve",   P_STRING|P_COMMA|P_NODUP|P_VI_DEF|P_VIM,
  4913.   #ifdef FEAT_VIRTUALEDIT
  4914.                   (char_u *)&p_ve, PV_NONE,
  4915. ***************
  4916. *** 2615,2665 ****
  4917.                   (char_u *)NULL, PV_NONE,
  4918.                   {(char_u *)0L, (char_u *)0L}
  4919.   #endif
  4920. !                 },
  4921.       {"visualbell",  "vb",   P_BOOL|P_VI_DEF,
  4922.                   (char_u *)&p_vb, PV_NONE,
  4923. !                 {(char_u *)FALSE, (char_u *)0L}},
  4924.       {"w300",        NULL,   P_NUM|P_VI_DEF,
  4925.                   (char_u *)NULL, PV_NONE,
  4926. !                 {(char_u *)0L, (char_u *)0L}},
  4927.       {"w1200",        NULL,   P_NUM|P_VI_DEF,
  4928.                   (char_u *)NULL, PV_NONE,
  4929. !                 {(char_u *)0L, (char_u *)0L}},
  4930.       {"w9600",        NULL,   P_NUM|P_VI_DEF,
  4931.                   (char_u *)NULL, PV_NONE,
  4932. !                 {(char_u *)0L, (char_u *)0L}},
  4933.       {"warn",        NULL,   P_BOOL|P_VI_DEF,
  4934.                   (char_u *)&p_warn, PV_NONE,
  4935. !                 {(char_u *)TRUE, (char_u *)0L}},
  4936.       {"weirdinvert", "wiv",  P_BOOL|P_VI_DEF|P_RCLR,
  4937.                   (char_u *)&p_wiv, PV_NONE,
  4938. !                 {(char_u *)FALSE, (char_u *)0L}},
  4939.       {"whichwrap",   "ww",   P_STRING|P_VIM|P_COMMA|P_FLAGLIST,
  4940.                   (char_u *)&p_ww, PV_NONE,
  4941. !                 {(char_u *)"", (char_u *)"b,s"}},
  4942.       {"wildchar",    "wc",   P_NUM|P_VIM,
  4943.                   (char_u *)&p_wc, PV_NONE,
  4944. !                 {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB}},
  4945.       {"wildcharm",   "wcm",   P_NUM|P_VI_DEF,
  4946.                   (char_u *)&p_wcm, PV_NONE,
  4947. !                 {(char_u *)0L, (char_u *)0L}},
  4948.       {"wildignore",  "wig",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  4949.   #ifdef FEAT_WILDIGN
  4950.                   (char_u *)&p_wig, PV_NONE,
  4951.   #else
  4952.                   (char_u *)NULL, PV_NONE,
  4953.   #endif
  4954. !                 {(char_u *)"", (char_u *)0L}},
  4955.       {"wildmenu",    "wmnu", P_BOOL|P_VI_DEF,
  4956.   #ifdef FEAT_WILDMENU
  4957.                   (char_u *)&p_wmnu, PV_NONE,
  4958.   #else
  4959.                   (char_u *)NULL, PV_NONE,
  4960.   #endif
  4961. !                 {(char_u *)FALSE, (char_u *)0L}},
  4962.       {"wildmode",    "wim",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  4963.                   (char_u *)&p_wim, PV_NONE,
  4964. !                 {(char_u *)"full", (char_u *)0L}},
  4965.       {"wildoptions", "wop",  P_STRING|P_VI_DEF,
  4966.   #ifdef FEAT_CMDL_COMPL
  4967.                   (char_u *)&p_wop, PV_NONE,
  4968. --- 2635,2686 ----
  4969.                   (char_u *)NULL, PV_NONE,
  4970.                   {(char_u *)0L, (char_u *)0L}
  4971.   #endif
  4972. !                 SCRIPTID_INIT},
  4973.       {"visualbell",  "vb",   P_BOOL|P_VI_DEF,
  4974.                   (char_u *)&p_vb, PV_NONE,
  4975. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4976.       {"w300",        NULL,   P_NUM|P_VI_DEF,
  4977.                   (char_u *)NULL, PV_NONE,
  4978. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  4979.       {"w1200",        NULL,   P_NUM|P_VI_DEF,
  4980.                   (char_u *)NULL, PV_NONE,
  4981. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  4982.       {"w9600",        NULL,   P_NUM|P_VI_DEF,
  4983.                   (char_u *)NULL, PV_NONE,
  4984. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  4985.       {"warn",        NULL,   P_BOOL|P_VI_DEF,
  4986.                   (char_u *)&p_warn, PV_NONE,
  4987. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  4988.       {"weirdinvert", "wiv",  P_BOOL|P_VI_DEF|P_RCLR,
  4989.                   (char_u *)&p_wiv, PV_NONE,
  4990. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  4991.       {"whichwrap",   "ww",   P_STRING|P_VIM|P_COMMA|P_FLAGLIST,
  4992.                   (char_u *)&p_ww, PV_NONE,
  4993. !                 {(char_u *)"", (char_u *)"b,s"} SCRIPTID_INIT},
  4994.       {"wildchar",    "wc",   P_NUM|P_VIM,
  4995.                   (char_u *)&p_wc, PV_NONE,
  4996. !                 {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB}
  4997. !                 SCRIPTID_INIT},
  4998.       {"wildcharm",   "wcm",   P_NUM|P_VI_DEF,
  4999.                   (char_u *)&p_wcm, PV_NONE,
  5000. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  5001.       {"wildignore",  "wig",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  5002.   #ifdef FEAT_WILDIGN
  5003.                   (char_u *)&p_wig, PV_NONE,
  5004.   #else
  5005.                   (char_u *)NULL, PV_NONE,
  5006.   #endif
  5007. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  5008.       {"wildmenu",    "wmnu", P_BOOL|P_VI_DEF,
  5009.   #ifdef FEAT_WILDMENU
  5010.                   (char_u *)&p_wmnu, PV_NONE,
  5011.   #else
  5012.                   (char_u *)NULL, PV_NONE,
  5013.   #endif
  5014. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  5015.       {"wildmode",    "wim",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
  5016.                   (char_u *)&p_wim, PV_NONE,
  5017. !                 {(char_u *)"full", (char_u *)0L} SCRIPTID_INIT},
  5018.       {"wildoptions", "wop",  P_STRING|P_VI_DEF,
  5019.   #ifdef FEAT_CMDL_COMPL
  5020.                   (char_u *)&p_wop, PV_NONE,
  5021. ***************
  5022. *** 2668,2674 ****
  5023.                   (char_u *)NULL, PV_NONE,
  5024.                   {(char_u *)NULL, (char_u *)0L}
  5025.   #endif
  5026. !                 },
  5027.       {"winaltkeys",  "wak",  P_STRING|P_VI_DEF,
  5028.   #ifdef FEAT_WAK
  5029.                   (char_u *)&p_wak, PV_NONE,
  5030. --- 2689,2695 ----
  5031.                   (char_u *)NULL, PV_NONE,
  5032.                   {(char_u *)NULL, (char_u *)0L}
  5033.   #endif
  5034. !                 SCRIPTID_INIT},
  5035.       {"winaltkeys",  "wak",  P_STRING|P_VI_DEF,
  5036.   #ifdef FEAT_WAK
  5037.                   (char_u *)&p_wak, PV_NONE,
  5038. ***************
  5039. *** 2677,2743 ****
  5040.                   (char_u *)NULL, PV_NONE,
  5041.                   {(char_u *)NULL, (char_u *)0L}
  5042.   #endif
  5043. !                 },
  5044.       {"window",        "wi",   P_NUM|P_VI_DEF,
  5045.                   (char_u *)&p_window, PV_NONE,
  5046. !                 {(char_u *)0L, (char_u *)0L}},
  5047.       {"winheight",   "wh",   P_NUM|P_VI_DEF,
  5048.   #ifdef FEAT_WINDOWS
  5049.                   (char_u *)&p_wh, PV_NONE,
  5050.   #else
  5051.                   (char_u *)NULL, PV_NONE,
  5052.   #endif
  5053. !                 {(char_u *)1L, (char_u *)0L}},
  5054.       {"winfixheight", "wfh", P_BOOL|P_VI_DEF|P_RSTAT,
  5055.   #ifdef FEAT_WINDOWS
  5056.                   (char_u *)VAR_WIN, PV_WFH,
  5057.   #else
  5058.                   (char_u *)NULL, PV_NONE,
  5059.   #endif
  5060. !                 {(char_u *)FALSE, (char_u *)0L}},
  5061.       {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT,
  5062.   #ifdef FEAT_VERTSPLIT
  5063.                   (char_u *)VAR_WIN, PV_WFW,
  5064.   #else
  5065.                   (char_u *)NULL, PV_NONE,
  5066.   #endif
  5067. !                 {(char_u *)FALSE, (char_u *)0L}},
  5068.       {"winminheight", "wmh", P_NUM|P_VI_DEF,
  5069.   #ifdef FEAT_WINDOWS
  5070.                   (char_u *)&p_wmh, PV_NONE,
  5071.   #else
  5072.                   (char_u *)NULL, PV_NONE,
  5073.   #endif
  5074. !                 {(char_u *)1L, (char_u *)0L}},
  5075.       {"winminwidth", "wmw", P_NUM|P_VI_DEF,
  5076.   #ifdef FEAT_VERTSPLIT
  5077.                   (char_u *)&p_wmw, PV_NONE,
  5078.   #else
  5079.                   (char_u *)NULL, PV_NONE,
  5080.   #endif
  5081. !                 {(char_u *)1L, (char_u *)0L}},
  5082.       {"winwidth",   "wiw",   P_NUM|P_VI_DEF,
  5083.   #ifdef FEAT_VERTSPLIT
  5084.                   (char_u *)&p_wiw, PV_NONE,
  5085.   #else
  5086.                   (char_u *)NULL, PV_NONE,
  5087.   #endif
  5088. !                 {(char_u *)20L, (char_u *)0L}},
  5089.       {"wrap",        NULL,   P_BOOL|P_VI_DEF|P_RWIN,
  5090.                   (char_u *)VAR_WIN, PV_WRAP,
  5091. !                 {(char_u *)TRUE, (char_u *)0L}},
  5092.       {"wrapmargin",  "wm",   P_NUM|P_VI_DEF,
  5093.                   (char_u *)&p_wm, PV_WM,
  5094. !                 {(char_u *)0L, (char_u *)0L}},
  5095.       {"wrapscan",    "ws",   P_BOOL|P_VI_DEF,
  5096.                   (char_u *)&p_ws, PV_NONE,
  5097. !                 {(char_u *)TRUE, (char_u *)0L}},
  5098.       {"write",        NULL,   P_BOOL|P_VI_DEF,
  5099.                   (char_u *)&p_write, PV_NONE,
  5100. !                 {(char_u *)TRUE, (char_u *)0L}},
  5101.       {"writeany",    "wa",   P_BOOL|P_VI_DEF,
  5102.                   (char_u *)&p_wa, PV_NONE,
  5103. !                 {(char_u *)FALSE, (char_u *)0L}},
  5104.       {"writebackup", "wb",   P_BOOL|P_VI_DEF|P_VIM,
  5105.                   (char_u *)&p_wb, PV_NONE,
  5106.                   {
  5107. --- 2698,2764 ----
  5108.                   (char_u *)NULL, PV_NONE,
  5109.                   {(char_u *)NULL, (char_u *)0L}
  5110.   #endif
  5111. !                 SCRIPTID_INIT},
  5112.       {"window",        "wi",   P_NUM|P_VI_DEF,
  5113.                   (char_u *)&p_window, PV_NONE,
  5114. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  5115.       {"winheight",   "wh",   P_NUM|P_VI_DEF,
  5116.   #ifdef FEAT_WINDOWS
  5117.                   (char_u *)&p_wh, PV_NONE,
  5118.   #else
  5119.                   (char_u *)NULL, PV_NONE,
  5120.   #endif
  5121. !                 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
  5122.       {"winfixheight", "wfh", P_BOOL|P_VI_DEF|P_RSTAT,
  5123.   #ifdef FEAT_WINDOWS
  5124.                   (char_u *)VAR_WIN, PV_WFH,
  5125.   #else
  5126.                   (char_u *)NULL, PV_NONE,
  5127.   #endif
  5128. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  5129.       {"winfixwidth", "wfw", P_BOOL|P_VI_DEF|P_RSTAT,
  5130.   #ifdef FEAT_VERTSPLIT
  5131.                   (char_u *)VAR_WIN, PV_WFW,
  5132.   #else
  5133.                   (char_u *)NULL, PV_NONE,
  5134.   #endif
  5135. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  5136.       {"winminheight", "wmh", P_NUM|P_VI_DEF,
  5137.   #ifdef FEAT_WINDOWS
  5138.                   (char_u *)&p_wmh, PV_NONE,
  5139.   #else
  5140.                   (char_u *)NULL, PV_NONE,
  5141.   #endif
  5142. !                 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
  5143.       {"winminwidth", "wmw", P_NUM|P_VI_DEF,
  5144.   #ifdef FEAT_VERTSPLIT
  5145.                   (char_u *)&p_wmw, PV_NONE,
  5146.   #else
  5147.                   (char_u *)NULL, PV_NONE,
  5148.   #endif
  5149. !                 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
  5150.       {"winwidth",   "wiw",   P_NUM|P_VI_DEF,
  5151.   #ifdef FEAT_VERTSPLIT
  5152.                   (char_u *)&p_wiw, PV_NONE,
  5153.   #else
  5154.                   (char_u *)NULL, PV_NONE,
  5155.   #endif
  5156. !                 {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
  5157.       {"wrap",        NULL,   P_BOOL|P_VI_DEF|P_RWIN,
  5158.                   (char_u *)VAR_WIN, PV_WRAP,
  5159. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  5160.       {"wrapmargin",  "wm",   P_NUM|P_VI_DEF,
  5161.                   (char_u *)&p_wm, PV_WM,
  5162. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  5163.       {"wrapscan",    "ws",   P_BOOL|P_VI_DEF,
  5164.                   (char_u *)&p_ws, PV_NONE,
  5165. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  5166.       {"write",        NULL,   P_BOOL|P_VI_DEF,
  5167.                   (char_u *)&p_write, PV_NONE,
  5168. !                 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
  5169.       {"writeany",    "wa",   P_BOOL|P_VI_DEF,
  5170.                   (char_u *)&p_wa, PV_NONE,
  5171. !                 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
  5172.       {"writebackup", "wb",   P_BOOL|P_VI_DEF|P_VIM,
  5173.                   (char_u *)&p_wb, PV_NONE,
  5174.                   {
  5175. ***************
  5176. *** 2746,2760 ****
  5177.   #else
  5178.                   (char_u *)FALSE,
  5179.   #endif
  5180. !                 (char_u *)0L}},
  5181.       {"writedelay",  "wd",   P_NUM|P_VI_DEF,
  5182.                   (char_u *)&p_wd, PV_NONE,
  5183. !                 {(char_u *)0L, (char_u *)0L}},
  5184.   
  5185.   /* terminal output codes */
  5186.   #define p_term(sss, vvv)   {sss, NULL, P_STRING|P_VI_DEF|P_RALL|P_SECURE, \
  5187.                   (char_u *)&vvv, PV_NONE, \
  5188. !                 {(char_u *)"", (char_u *)0L}},
  5189.   
  5190.       p_term("t_AB", T_CAB)
  5191.       p_term("t_AF", T_CAF)
  5192. --- 2767,2781 ----
  5193.   #else
  5194.                   (char_u *)FALSE,
  5195.   #endif
  5196. !                 (char_u *)0L} SCRIPTID_INIT},
  5197.       {"writedelay",  "wd",   P_NUM|P_VI_DEF,
  5198.                   (char_u *)&p_wd, PV_NONE,
  5199. !                 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
  5200.   
  5201.   /* terminal output codes */
  5202.   #define p_term(sss, vvv)   {sss, NULL, P_STRING|P_VI_DEF|P_RALL|P_SECURE, \
  5203.                   (char_u *)&vvv, PV_NONE, \
  5204. !                 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
  5205.   
  5206.       p_term("t_AB", T_CAB)
  5207.       p_term("t_AF", T_CAF)
  5208. ***************
  5209. *** 2815,2821 ****
  5210.   
  5211.   /* terminal key codes are not in here */
  5212.   
  5213. !     {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL}}    /* end marker */
  5214.   };
  5215.   
  5216.   #define PARAM_COUNT (sizeof(options) / sizeof(struct vimoption))
  5217. --- 2836,2843 ----
  5218.   
  5219.   /* terminal key codes are not in here */
  5220.   
  5221. !     /* end marker */
  5222. !     {NULL, NULL, 0, NULL, PV_NONE, {NULL, NULL} SCRIPTID_INIT}
  5223.   };
  5224.   
  5225.   #define PARAM_COUNT (sizeof(options) / sizeof(struct vimoption))
  5226. ***************
  5227. *** 9917,9923 ****
  5228.       regmatch->rm_ic = ic;
  5229.       if (xp->xp_context != EXPAND_BOOL_SETTINGS)
  5230.       {
  5231. !         for (match = 0; match < sizeof(names) / sizeof(char *); ++match)
  5232.           if (vim_regexec(regmatch, (char_u *)names[match], (colnr_T)0))
  5233.           {
  5234.               if (loop == 0)
  5235. --- 9939,9946 ----
  5236.       regmatch->rm_ic = ic;
  5237.       if (xp->xp_context != EXPAND_BOOL_SETTINGS)
  5238.       {
  5239. !         for (match = 0; match < (int)(sizeof(names) / sizeof(char *));
  5240. !                                       ++match)
  5241.           if (vim_regexec(regmatch, (char_u *)names[match], (colnr_T)0))
  5242.           {
  5243.               if (loop == 0)
  5244. *** ../vim-7.2.179/src/os_unix.c    2009-05-16 16:36:25.000000000 +0200
  5245. --- src/os_unix.c    2009-05-17 12:17:01.000000000 +0200
  5246. ***************
  5247. *** 821,827 ****
  5248.   #endif
  5249.   
  5250.   #if defined(SIGINT)
  5251. - /* ARGSUSED */
  5252.       static RETSIGTYPE
  5253.   catch_sigint SIGDEFARG(sigarg)
  5254.   {
  5255. --- 821,826 ----
  5256. ***************
  5257. *** 833,839 ****
  5258.   #endif
  5259.   
  5260.   #if defined(SIGPWR)
  5261. - /* ARGSUSED */
  5262.       static RETSIGTYPE
  5263.   catch_sigpwr SIGDEFARG(sigarg)
  5264.   {
  5265. --- 832,837 ----
  5266. ***************
  5267. *** 853,859 ****
  5268.   /*
  5269.    * signal function for alarm().
  5270.    */
  5271. - /* ARGSUSED */
  5272.       static RETSIGTYPE
  5273.   sig_alarm SIGDEFARG(sigarg)
  5274.   {
  5275. --- 851,856 ----
  5276. ***************
  5277. *** 1087,1093 ****
  5278.   /*
  5279.    * signal handler for SIGCONT
  5280.    */
  5281. - /* ARGSUSED */
  5282.       static RETSIGTYPE
  5283.   sigcont_handler SIGDEFARG(sigarg)
  5284.   {
  5285. --- 1084,1089 ----
  5286. ***************
  5287. *** 1436,1446 ****
  5288.   /*
  5289.    * Another X Error handler, just used to check for errors.
  5290.    */
  5291. - /* ARGSUSED */
  5292.       static int
  5293.   x_error_check(dpy, error_event)
  5294. !     Display *dpy;
  5295. !     XErrorEvent    *error_event;
  5296.   {
  5297.       got_x_error = TRUE;
  5298.       return 0;
  5299. --- 1432,1441 ----
  5300.   /*
  5301.    * Another X Error handler, just used to check for errors.
  5302.    */
  5303.       static int
  5304.   x_error_check(dpy, error_event)
  5305. !     Display *dpy UNUSED;
  5306. !     XErrorEvent    *error_event UNUSED;
  5307.   {
  5308.       got_x_error = TRUE;
  5309.       return 0;
  5310. ***************
  5311. *** 1453,1467 ****
  5312.    */
  5313.   static int x_IOerror_check __ARGS((Display *dpy));
  5314.   
  5315. - /* ARGSUSED */
  5316.       static int
  5317.   x_IOerror_check(dpy)
  5318. !     Display *dpy;
  5319.   {
  5320.       /* This function should not return, it causes exit().  Longjump instead. */
  5321.       LONGJMP(lc_jump_env, 1);
  5322. -     /*NOTREACHED*/
  5323. -     return 0;
  5324.   }
  5325.   # endif
  5326.   
  5327. --- 1448,1459 ----
  5328.    */
  5329.   static int x_IOerror_check __ARGS((Display *dpy));
  5330.   
  5331.       static int
  5332.   x_IOerror_check(dpy)
  5333. !     Display *dpy UNUSED;
  5334.   {
  5335.       /* This function should not return, it causes exit().  Longjump instead. */
  5336.       LONGJMP(lc_jump_env, 1);
  5337.   }
  5338.   # endif
  5339.   
  5340. ***************
  5341. *** 1470,1479 ****
  5342.    */
  5343.   static int x_IOerror_handler __ARGS((Display *dpy));
  5344.   
  5345. - /* ARGSUSED */
  5346.       static int
  5347.   x_IOerror_handler(dpy)
  5348. !     Display *dpy;
  5349.   {
  5350.       xterm_dpy = NULL;
  5351.       x11_window = 0;
  5352. --- 1462,1470 ----
  5353.    */
  5354.   static int x_IOerror_handler __ARGS((Display *dpy));
  5355.   
  5356.       static int
  5357.   x_IOerror_handler(dpy)
  5358. !     Display *dpy UNUSED;
  5359.   {
  5360.       xterm_dpy = NULL;
  5361.       x11_window = 0;
  5362. ***************
  5363. *** 1482,1489 ****
  5364.   
  5365.       /* This function should not return, it causes exit().  Longjump instead. */
  5366.       LONGJMP(x_jump_env, 1);
  5367. -     /*NOTREACHED*/
  5368. -     return 0;
  5369.   }
  5370.   #endif
  5371.   
  5372. --- 1473,1478 ----
  5373. ***************
  5374. *** 1919,1928 ****
  5375.   
  5376.   #else  /* FEAT_X11 */
  5377.   
  5378. - /*ARGSUSED*/
  5379.       static int
  5380.   get_x11_title(test_only)
  5381. !     int        test_only;
  5382.   {
  5383.       return FALSE;
  5384.   }
  5385. --- 1908,1916 ----
  5386.   
  5387.   #else  /* FEAT_X11 */
  5388.   
  5389.       static int
  5390.   get_x11_title(test_only)
  5391. !     int        test_only UNUSED;
  5392.   {
  5393.       return FALSE;
  5394.   }
  5395. ***************
  5396. *** 2497,2507 ****
  5397.    * file name to remain exactly the same.
  5398.    * Only required for file systems where case is ignored and preserved.
  5399.    */
  5400. - /*ARGSUSED*/
  5401.       void
  5402.   fname_case(name, len)
  5403.       char_u    *name;
  5404. !     int        len;        /* buffer size, only used when name gets longer */
  5405.   {
  5406.       struct stat st;
  5407.       char_u    *slash, *tail;
  5408. --- 2485,2494 ----
  5409.    * file name to remain exactly the same.
  5410.    * Only required for file systems where case is ignored and preserved.
  5411.    */
  5412.       void
  5413.   fname_case(name, len)
  5414.       char_u    *name;
  5415. !     int        len UNUSED;  /* buffer size, only used when name gets longer */
  5416.   {
  5417.       struct stat st;
  5418.       char_u    *slash, *tail;
  5419. ***************
  5420. *** 5141,5147 ****
  5421.   
  5422.   #define SHELL_SPECIAL (char_u *)"\t \"&'$;<>()\\|"
  5423.   
  5424. - /* ARGSUSED */
  5425.       int
  5426.   mch_expand_wildcards(num_pat, pat, num_file, file, flags)
  5427.       int           num_pat;
  5428. --- 5128,5133 ----
  5429. ***************
  5430. *** 6068,6074 ****
  5431.   /*
  5432.    * Gets info from sysmouse and adds special keys to input buf.
  5433.    */
  5434. - /* ARGSUSED */
  5435.       static RETSIGTYPE
  5436.   sig_sysmouse SIGDEFARG(sigarg)
  5437.   {
  5438. --- 6054,6059 ----
  5439. ***************
  5440. *** 6632,6642 ****
  5441.    * This is our chance to ask the user if they want to save,
  5442.    * or abort the logout
  5443.    */
  5444. - /*ARGSUSED*/
  5445.       static void
  5446.   xsmp_handle_interaction(smc_conn, client_data)
  5447.       SmcConn    smc_conn;
  5448. !     SmPointer    client_data;
  5449.   {
  5450.       cmdmod_T    save_cmdmod;
  5451.       int        cancel_shutdown = False;
  5452. --- 6617,6626 ----
  5453.    * This is our chance to ask the user if they want to save,
  5454.    * or abort the logout
  5455.    */
  5456.       static void
  5457.   xsmp_handle_interaction(smc_conn, client_data)
  5458.       SmcConn    smc_conn;
  5459. !     SmPointer    client_data UNUSED;
  5460.   {
  5461.       cmdmod_T    save_cmdmod;
  5462.       int        cancel_shutdown = False;
  5463. ***************
  5464. *** 6669,6684 ****
  5465.   /*
  5466.    * Callback that starts save-yourself.
  5467.    */
  5468. - /*ARGSUSED*/
  5469.       static void
  5470.   xsmp_handle_save_yourself(smc_conn, client_data, save_type,
  5471.                              shutdown, interact_style, fast)
  5472.       SmcConn    smc_conn;
  5473. !     SmPointer    client_data;
  5474. !     int        save_type;
  5475.       Bool    shutdown;
  5476. !     int        interact_style;
  5477. !     Bool    fast;
  5478.   {
  5479.       /* Handle already being in saveyourself */
  5480.       if (xsmp.save_yourself)
  5481. --- 6653,6667 ----
  5482.   /*
  5483.    * Callback that starts save-yourself.
  5484.    */
  5485.       static void
  5486.   xsmp_handle_save_yourself(smc_conn, client_data, save_type,
  5487.                              shutdown, interact_style, fast)
  5488.       SmcConn    smc_conn;
  5489. !     SmPointer    client_data UNUSED;
  5490. !     int        save_type UNUSED;
  5491.       Bool    shutdown;
  5492. !     int        interact_style UNUSED;
  5493. !     Bool    fast UNUSED;
  5494.   {
  5495.       /* Handle already being in saveyourself */
  5496.       if (xsmp.save_yourself)
  5497. ***************
  5498. *** 6712,6722 ****
  5499.   /*
  5500.    * Callback to warn us of imminent death.
  5501.    */
  5502. - /*ARGSUSED*/
  5503.       static void
  5504.   xsmp_die(smc_conn, client_data)
  5505. !     SmcConn    smc_conn;
  5506. !     SmPointer    client_data;
  5507.   {
  5508.       xsmp_close();
  5509.   
  5510. --- 6695,6704 ----
  5511.   /*
  5512.    * Callback to warn us of imminent death.
  5513.    */
  5514.       static void
  5515.   xsmp_die(smc_conn, client_data)
  5516. !     SmcConn    smc_conn UNUSED;
  5517. !     SmPointer    client_data UNUSED;
  5518.   {
  5519.       xsmp_close();
  5520.   
  5521. ***************
  5522. *** 6728,6738 ****
  5523.   /*
  5524.    * Callback to tell us that save-yourself has completed.
  5525.    */
  5526. - /*ARGSUSED*/
  5527.       static void
  5528.   xsmp_save_complete(smc_conn, client_data)
  5529. !     SmcConn    smc_conn;
  5530. !     SmPointer    client_data;
  5531.   {
  5532.       xsmp.save_yourself = False;
  5533.   }
  5534. --- 6710,6719 ----
  5535.   /*
  5536.    * Callback to tell us that save-yourself has completed.
  5537.    */
  5538.       static void
  5539.   xsmp_save_complete(smc_conn, client_data)
  5540. !     SmcConn    smc_conn UNUSED;
  5541. !     SmPointer    client_data UNUSED;
  5542.   {
  5543.       xsmp.save_yourself = False;
  5544.   }
  5545. ***************
  5546. *** 6742,6752 ****
  5547.    * Callback to tell us that an instigated shutdown was cancelled
  5548.    * (maybe even by us)
  5549.    */
  5550. - /*ARGSUSED*/
  5551.       static void
  5552.   xsmp_shutdown_cancelled(smc_conn, client_data)
  5553.       SmcConn    smc_conn;
  5554. !     SmPointer    client_data;
  5555.   {
  5556.       if (xsmp.save_yourself)
  5557.       SmcSaveYourselfDone(smc_conn, True);
  5558. --- 6723,6732 ----
  5559.    * Callback to tell us that an instigated shutdown was cancelled
  5560.    * (maybe even by us)
  5561.    */
  5562.       static void
  5563.   xsmp_shutdown_cancelled(smc_conn, client_data)
  5564.       SmcConn    smc_conn;
  5565. !     SmPointer    client_data UNUSED;
  5566.   {
  5567.       if (xsmp.save_yourself)
  5568.       SmcSaveYourselfDone(smc_conn, True);
  5569. ***************
  5570. *** 6758,6770 ****
  5571.   /*
  5572.    * Callback to tell us that a new ICE connection has been established.
  5573.    */
  5574. - /*ARGSUSED*/
  5575.       static void
  5576.   xsmp_ice_connection(iceConn, clientData, opening, watchData)
  5577.       IceConn    iceConn;
  5578. !     IcePointer    clientData;
  5579.       Bool    opening;
  5580. !     IcePointer    *watchData;
  5581.   {
  5582.       /* Intercept creation of ICE connection fd */
  5583.       if (opening)
  5584. --- 6738,6749 ----
  5585.   /*
  5586.    * Callback to tell us that a new ICE connection has been established.
  5587.    */
  5588.       static void
  5589.   xsmp_ice_connection(iceConn, clientData, opening, watchData)
  5590.       IceConn    iceConn;
  5591. !     IcePointer    clientData UNUSED;
  5592.       Bool    opening;
  5593. !     IcePointer    *watchData UNUSED;
  5594.   {
  5595.       /* Intercept creation of ICE connection fd */
  5596.       if (opening)
  5597. *** ../vim-7.2.179/src/quickfix.c    2009-05-13 18:54:14.000000000 +0200
  5598. --- src/quickfix.c    2009-05-16 22:31:49.000000000 +0200
  5599. ***************
  5600. *** 2240,2246 ****
  5601.    * ":cclose": close the window showing the list of errors.
  5602.    * ":lclose": close the window showing the location list
  5603.    */
  5604. - /*ARGSUSED*/
  5605.       void
  5606.   ex_cclose(eap)
  5607.       exarg_T    *eap;
  5608. --- 2240,2245 ----
  5609. ***************
  5610. *** 3211,3217 ****
  5611.               break;
  5612.               col = regmatch.endpos[0].col
  5613.                           + (col == regmatch.endpos[0].col);
  5614. !             if (col > STRLEN(ml_get_buf(buf, lnum, FALSE)))
  5615.               break;
  5616.           }
  5617.           line_breakcheck();
  5618. --- 3210,3216 ----
  5619.               break;
  5620.               col = regmatch.endpos[0].col
  5621.                           + (col == regmatch.endpos[0].col);
  5622. !             if (col > (colnr_T)STRLEN(ml_get_buf(buf, lnum, FALSE)))
  5623.               break;
  5624.           }
  5625.           line_breakcheck();
  5626. *** ../vim-7.2.179/src/screen.c    2009-05-13 12:46:36.000000000 +0200
  5627. --- src/screen.c    2009-05-16 21:51:13.000000000 +0200
  5628. ***************
  5629. *** 270,280 ****
  5630.    * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot
  5631.    * may become invalid and the whole window will have to be redrawn.
  5632.    */
  5633. - /*ARGSUSED*/
  5634.       void
  5635.   redrawWinline(lnum, invalid)
  5636.       linenr_T    lnum;
  5637. !     int        invalid;    /* window line height is invalid now */
  5638.   {
  5639.   #ifdef FEAT_FOLDING
  5640.       int        i;
  5641. --- 270,279 ----
  5642.    * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot
  5643.    * may become invalid and the whole window will have to be redrawn.
  5644.    */
  5645.       void
  5646.   redrawWinline(lnum, invalid)
  5647.       linenr_T    lnum;
  5648. !     int        invalid UNUSED;    /* window line height is invalid now */
  5649.   {
  5650.   #ifdef FEAT_FOLDING
  5651.       int        i;
  5652. ***************
  5653. *** 2413,2419 ****
  5654.               && (lnume < bot->lnum
  5655.                   || (lnume == bot->lnum
  5656.                   && (bot->col - (*p_sel == 'e'))
  5657. !         >= STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE)))))))
  5658.       {
  5659.           if (VIsual_mode == Ctrl_V)
  5660.           {
  5661. --- 2412,2418 ----
  5662.               && (lnume < bot->lnum
  5663.                   || (lnume == bot->lnum
  5664.                   && (bot->col - (*p_sel == 'e'))
  5665. !         >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE)))))))
  5666.       {
  5667.           if (VIsual_mode == Ctrl_V)
  5668.           {
  5669. ***************
  5670. *** 2549,2562 ****
  5671.    *
  5672.    * Return the number of last row the line occupies.
  5673.    */
  5674. - /* ARGSUSED */
  5675.       static int
  5676.   win_line(wp, lnum, startrow, endrow, nochange)
  5677.       win_T    *wp;
  5678.       linenr_T    lnum;
  5679.       int        startrow;
  5680.       int        endrow;
  5681. !     int        nochange;        /* not updating for changed text */
  5682.   {
  5683.       int        col;            /* visual column on screen */
  5684.       unsigned    off;            /* offset in ScreenLines/ScreenAttrs */
  5685. --- 2548,2560 ----
  5686.    *
  5687.    * Return the number of last row the line occupies.
  5688.    */
  5689.       static int
  5690.   win_line(wp, lnum, startrow, endrow, nochange)
  5691.       win_T    *wp;
  5692.       linenr_T    lnum;
  5693.       int        startrow;
  5694.       int        endrow;
  5695. !     int        nochange UNUSED;    /* not updating for changed text */
  5696.   {
  5697.       int        col;            /* visual column on screen */
  5698.       unsigned    off;            /* offset in ScreenLines/ScreenAttrs */
  5699. ***************
  5700. *** 6098,6104 ****
  5701.                   fillchar, maxwidth, hltab, tabtab);
  5702.       len = (int)STRLEN(buf);
  5703.   
  5704. !     while (width < maxwidth && len < sizeof(buf) - 1)
  5705.       {
  5706.   #ifdef FEAT_MBYTE
  5707.       len += (*mb_char2bytes)(fillchar, buf + len);
  5708. --- 6096,6102 ----
  5709.                   fillchar, maxwidth, hltab, tabtab);
  5710.       len = (int)STRLEN(buf);
  5711.   
  5712. !     while (width < maxwidth && len < (int)sizeof(buf) - 1)
  5713.       {
  5714.   #ifdef FEAT_MBYTE
  5715.       len += (*mb_char2bytes)(fillchar, buf + len);
  5716. ***************
  5717. *** 8655,8661 ****
  5718.    *
  5719.    * Return OK for success, FAIL if the lines are not deleted.
  5720.    */
  5721. - /*ARGSUSED*/
  5722.       int
  5723.   screen_del_lines(off, row, line_count, end, force, wp)
  5724.       int        off;
  5725. --- 8653,8658 ----
  5726. ***************
  5727. *** 8663,8669 ****
  5728.       int        line_count;
  5729.       int        end;
  5730.       int        force;        /* even when line_count > p_ttyscroll */
  5731. !     win_T    *wp;        /* NULL or window to use width from */
  5732.   {
  5733.       int        j;
  5734.       int        i;
  5735. --- 8660,8666 ----
  5736.       int        line_count;
  5737.       int        end;
  5738.       int        force;        /* even when line_count > p_ttyscroll */
  5739. !     win_T    *wp UNUSED;    /* NULL or window to use width from */
  5740.   {
  5741.       int        j;
  5742.       int        i;
  5743. *** ../vim-7.2.179/src/search.c    2009-05-15 21:31:11.000000000 +0200
  5744. --- src/search.c    2009-05-16 22:33:05.000000000 +0200
  5745. ***************
  5746. *** 4527,4538 ****
  5747.    * Find identifiers or defines in included files.
  5748.    * if p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase.
  5749.    */
  5750. - /*ARGSUSED*/
  5751.       void
  5752.   find_pattern_in_path(ptr, dir, len, whole, skip_comments,
  5753.                       type, count, action, start_lnum, end_lnum)
  5754.       char_u    *ptr;        /* pointer to search pattern */
  5755. !     int        dir;        /* direction of expansion */
  5756.       int        len;        /* length of search pattern */
  5757.       int        whole;        /* match whole words only */
  5758.       int        skip_comments;    /* don't match inside comments */
  5759. --- 4527,4537 ----
  5760.    * Find identifiers or defines in included files.
  5761.    * if p_ic && (compl_cont_status & CONT_SOL) then ptr must be in lowercase.
  5762.    */
  5763.       void
  5764.   find_pattern_in_path(ptr, dir, len, whole, skip_comments,
  5765.                       type, count, action, start_lnum, end_lnum)
  5766.       char_u    *ptr;        /* pointer to search pattern */
  5767. !     int        dir UNUSED;    /* direction of expansion */
  5768.       int        len;        /* length of search pattern */
  5769.       int        whole;        /* match whole words only */
  5770.       int        skip_comments;    /* don't match inside comments */
  5771. *** ../vim-7.2.179/src/spell.c    2009-05-13 18:54:14.000000000 +0200
  5772. --- src/spell.c    2009-05-16 22:10:19.000000000 +0200
  5773. ***************
  5774. *** 950,957 ****
  5775.    */
  5776.   #ifndef FEAT_MBYTE
  5777.   /* Non-multi-byte implementation. */
  5778. ! # define SPELL_TOFOLD(c) ((c) < 256 ? spelltab.st_fold[c] : (c))
  5779. ! # define SPELL_TOUPPER(c) ((c) < 256 ? spelltab.st_upper[c] : (c))
  5780.   # define SPELL_ISUPPER(c) ((c) < 256 ? spelltab.st_isu[c] : FALSE)
  5781.   #else
  5782.   # if defined(HAVE_WCHAR_H)
  5783. --- 950,957 ----
  5784.    */
  5785.   #ifndef FEAT_MBYTE
  5786.   /* Non-multi-byte implementation. */
  5787. ! # define SPELL_TOFOLD(c) ((c) < 256 ? (int)spelltab.st_fold[c] : (c))
  5788. ! # define SPELL_TOUPPER(c) ((c) < 256 ? (int)spelltab.st_upper[c] : (c))
  5789.   # define SPELL_ISUPPER(c) ((c) < 256 ? spelltab.st_isu[c] : FALSE)
  5790.   #else
  5791.   # if defined(HAVE_WCHAR_H)
  5792. ***************
  5793. *** 962,979 ****
  5794.    * the "w" library function for characters above 255 if available. */
  5795.   # ifdef HAVE_TOWLOWER
  5796.   #  define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \
  5797. !         : (c) < 256 ? spelltab.st_fold[c] : towlower(c))
  5798.   # else
  5799.   #  define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \
  5800. !         : (c) < 256 ? spelltab.st_fold[c] : (c))
  5801.   # endif
  5802.   
  5803.   # ifdef HAVE_TOWUPPER
  5804.   #  define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \
  5805. !         : (c) < 256 ? spelltab.st_upper[c] : towupper(c))
  5806.   # else
  5807.   #  define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \
  5808. !         : (c) < 256 ? spelltab.st_upper[c] : (c))
  5809.   # endif
  5810.   
  5811.   # ifdef HAVE_ISWUPPER
  5812. --- 962,979 ----
  5813.    * the "w" library function for characters above 255 if available. */
  5814.   # ifdef HAVE_TOWLOWER
  5815.   #  define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \
  5816. !         : (c) < 256 ? (int)spelltab.st_fold[c] : (int)towlower(c))
  5817.   # else
  5818.   #  define SPELL_TOFOLD(c) (enc_utf8 && (c) >= 128 ? utf_fold(c) \
  5819. !         : (c) < 256 ? (int)spelltab.st_fold[c] : (c))
  5820.   # endif
  5821.   
  5822.   # ifdef HAVE_TOWUPPER
  5823.   #  define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \
  5824. !         : (c) < 256 ? (int)spelltab.st_upper[c] : (int)towupper(c))
  5825.   # else
  5826.   #  define SPELL_TOUPPER(c) (enc_utf8 && (c) >= 128 ? utf_toupper(c) \
  5827. !         : (c) < 256 ? (int)spelltab.st_upper[c] : (c))
  5828.   # endif
  5829.   
  5830.   # ifdef HAVE_ISWUPPER
  5831. ***************
  5832. *** 8052,8058 ****
  5833.       /* time_t can be up to 8 bytes in size, more than long_u, thus we
  5834.        * can't use put_bytes() here. */
  5835.       for (i = 7; i >= 0; --i)
  5836. !     if (i + 1 > sizeof(time_t))
  5837.           /* ">>" doesn't work well when shifting more bits than avail */
  5838.           putc(0, fd);
  5839.       else
  5840. --- 8052,8058 ----
  5841.       /* time_t can be up to 8 bytes in size, more than long_u, thus we
  5842.        * can't use put_bytes() here. */
  5843.       for (i = 7; i >= 0; --i)
  5844. !     if (i + 1 > (int)sizeof(time_t))
  5845.           /* ">>" doesn't work well when shifting more bits than avail */
  5846.           putc(0, fd);
  5847.       else
  5848. ***************
  5849. *** 10541,10550 ****
  5850.   /*
  5851.    * ":spellrepall"
  5852.    */
  5853. - /*ARGSUSED*/
  5854.       void
  5855.   ex_spellrepall(eap)
  5856. !     exarg_T *eap;
  5857.   {
  5858.       pos_T    pos = curwin->w_cursor;
  5859.       char_u    *frompat;
  5860. --- 10541,10549 ----
  5861.   /*
  5862.    * ":spellrepall"
  5863.    */
  5864.       void
  5865.   ex_spellrepall(eap)
  5866. !     exarg_T *eap UNUSED;
  5867.   {
  5868.       pos_T    pos = curwin->w_cursor;
  5869.       char_u    *frompat;
  5870. ***************
  5871. *** 15604,15613 ****
  5872.   /*
  5873.    * ":spellinfo"
  5874.    */
  5875. - /*ARGSUSED*/
  5876.       void
  5877.   ex_spellinfo(eap)
  5878. !     exarg_T *eap;
  5879.   {
  5880.       int        lpi;
  5881.       langp_T    *lp;
  5882. --- 15603,15611 ----
  5883.   /*
  5884.    * ":spellinfo"
  5885.    */
  5886.       void
  5887.   ex_spellinfo(eap)
  5888. !     exarg_T *eap UNUSED;
  5889.   {
  5890.       int        lpi;
  5891.       langp_T    *lp;
  5892. ***************
  5893. *** 16153,16159 ****
  5894.    */
  5895.       int
  5896.   expand_spelling(lnum, pat, matchp)
  5897. !     linenr_T    lnum;
  5898.       char_u    *pat;
  5899.       char_u    ***matchp;
  5900.   {
  5901. --- 16151,16157 ----
  5902.    */
  5903.       int
  5904.   expand_spelling(lnum, pat, matchp)
  5905. !     linenr_T    lnum UNUSED;
  5906.       char_u    *pat;
  5907.       char_u    ***matchp;
  5908.   {
  5909. *** ../vim-7.2.179/src/syntax.c    2008-08-09 19:37:33.000000000 +0200
  5910. --- src/syntax.c    2009-05-16 22:14:19.000000000 +0200
  5911. ***************
  5912. *** 3224,3234 ****
  5913.   /*
  5914.    * Handle ":syntax case" command.
  5915.    */
  5916. - /* ARGSUSED */
  5917.       static void
  5918.   syn_cmd_case(eap, syncing)
  5919.       exarg_T    *eap;
  5920. !     int        syncing;        /* not used */
  5921.   {
  5922.       char_u    *arg = eap->arg;
  5923.       char_u    *next;
  5924. --- 3224,3233 ----
  5925.   /*
  5926.    * Handle ":syntax case" command.
  5927.    */
  5928.       static void
  5929.   syn_cmd_case(eap, syncing)
  5930.       exarg_T    *eap;
  5931. !     int        syncing UNUSED;
  5932.   {
  5933.       char_u    *arg = eap->arg;
  5934.       char_u    *next;
  5935. ***************
  5936. *** 3249,3259 ****
  5937.   /*
  5938.    * Handle ":syntax spell" command.
  5939.    */
  5940. - /* ARGSUSED */
  5941.       static void
  5942.   syn_cmd_spell(eap, syncing)
  5943.       exarg_T    *eap;
  5944. !     int        syncing;        /* not used */
  5945.   {
  5946.       char_u    *arg = eap->arg;
  5947.       char_u    *next;
  5948. --- 3248,3257 ----
  5949.   /*
  5950.    * Handle ":syntax spell" command.
  5951.    */
  5952.       static void
  5953.   syn_cmd_spell(eap, syncing)
  5954.       exarg_T    *eap;
  5955. !     int        syncing UNUSED;
  5956.   {
  5957.       char_u    *arg = eap->arg;
  5958.       char_u    *next;
  5959. ***************
  5960. *** 3517,3527 ****
  5961.   /*
  5962.    * Handle ":syntax on" command.
  5963.    */
  5964. - /* ARGSUSED */
  5965.       static void
  5966.   syn_cmd_on(eap, syncing)
  5967.       exarg_T    *eap;
  5968. !     int        syncing;    /* not used */
  5969.   {
  5970.       syn_cmd_onoff(eap, "syntax");
  5971.   }
  5972. --- 3515,3524 ----
  5973.   /*
  5974.    * Handle ":syntax on" command.
  5975.    */
  5976.       static void
  5977.   syn_cmd_on(eap, syncing)
  5978.       exarg_T    *eap;
  5979. !     int        syncing UNUSED;
  5980.   {
  5981.       syn_cmd_onoff(eap, "syntax");
  5982.   }
  5983. ***************
  5984. *** 3529,3539 ****
  5985.   /*
  5986.    * Handle ":syntax enable" command.
  5987.    */
  5988. - /* ARGSUSED */
  5989.       static void
  5990.   syn_cmd_enable(eap, syncing)
  5991.       exarg_T    *eap;
  5992. !     int        syncing;    /* not used */
  5993.   {
  5994.       set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"enable");
  5995.       syn_cmd_onoff(eap, "syntax");
  5996. --- 3526,3535 ----
  5997.   /*
  5998.    * Handle ":syntax enable" command.
  5999.    */
  6000.       static void
  6001.   syn_cmd_enable(eap, syncing)
  6002.       exarg_T    *eap;
  6003. !     int        syncing UNUSED;
  6004.   {
  6005.       set_internal_string_var((char_u *)"syntax_cmd", (char_u *)"enable");
  6006.       syn_cmd_onoff(eap, "syntax");
  6007. ***************
  6008. *** 3543,3553 ****
  6009.   /*
  6010.    * Handle ":syntax reset" command.
  6011.    */
  6012. - /* ARGSUSED */
  6013.       static void
  6014.   syn_cmd_reset(eap, syncing)
  6015.       exarg_T    *eap;
  6016. !     int        syncing;    /* not used */
  6017.   {
  6018.       eap->nextcmd = check_nextcmd(eap->arg);
  6019.       if (!eap->skip)
  6020. --- 3539,3548 ----
  6021.   /*
  6022.    * Handle ":syntax reset" command.
  6023.    */
  6024.       static void
  6025.   syn_cmd_reset(eap, syncing)
  6026.       exarg_T    *eap;
  6027. !     int        syncing UNUSED;
  6028.   {
  6029.       eap->nextcmd = check_nextcmd(eap->arg);
  6030.       if (!eap->skip)
  6031. ***************
  6032. *** 3561,3571 ****
  6033.   /*
  6034.    * Handle ":syntax manual" command.
  6035.    */
  6036. - /* ARGSUSED */
  6037.       static void
  6038.   syn_cmd_manual(eap, syncing)
  6039.       exarg_T    *eap;
  6040. !     int        syncing;    /* not used */
  6041.   {
  6042.       syn_cmd_onoff(eap, "manual");
  6043.   }
  6044. --- 3556,3565 ----
  6045.   /*
  6046.    * Handle ":syntax manual" command.
  6047.    */
  6048.       static void
  6049.   syn_cmd_manual(eap, syncing)
  6050.       exarg_T    *eap;
  6051. !     int        syncing UNUSED;
  6052.   {
  6053.       syn_cmd_onoff(eap, "manual");
  6054.   }
  6055. ***************
  6056. *** 3573,3583 ****
  6057.   /*
  6058.    * Handle ":syntax off" command.
  6059.    */
  6060. - /* ARGSUSED */
  6061.       static void
  6062.   syn_cmd_off(eap, syncing)
  6063.       exarg_T    *eap;
  6064. !     int        syncing;    /* not used */
  6065.   {
  6066.       syn_cmd_onoff(eap, "nosyntax");
  6067.   }
  6068. --- 3567,3576 ----
  6069.   /*
  6070.    * Handle ":syntax off" command.
  6071.    */
  6072.       static void
  6073.   syn_cmd_off(eap, syncing)
  6074.       exarg_T    *eap;
  6075. !     int        syncing UNUSED;
  6076.   {
  6077.       syn_cmd_onoff(eap, "nosyntax");
  6078.   }
  6079. ***************
  6080. *** 4461,4471 ****
  6081.   /*
  6082.    * Handle ":syntax include [@{group-name}] filename" command.
  6083.    */
  6084. - /* ARGSUSED */
  6085.       static void
  6086.   syn_cmd_include(eap, syncing)
  6087.       exarg_T    *eap;
  6088. !     int        syncing;        /* not used */
  6089.   {
  6090.       char_u    *arg = eap->arg;
  6091.       int        sgl_id = 1;
  6092. --- 4454,4463 ----
  6093.   /*
  6094.    * Handle ":syntax include [@{group-name}] filename" command.
  6095.    */
  6096.       static void
  6097.   syn_cmd_include(eap, syncing)
  6098.       exarg_T    *eap;
  6099. !     int        syncing UNUSED;
  6100.   {
  6101.       char_u    *arg = eap->arg;
  6102.       int        sgl_id = 1;
  6103. ***************
  6104. *** 4532,4542 ****
  6105.   /*
  6106.    * Handle ":syntax keyword {group-name} [{option}] keyword .." command.
  6107.    */
  6108. - /* ARGSUSED */
  6109.       static void
  6110.   syn_cmd_keyword(eap, syncing)
  6111.       exarg_T    *eap;
  6112. !     int        syncing;        /* not used */
  6113.   {
  6114.       char_u    *arg = eap->arg;
  6115.       char_u    *group_name_end;
  6116. --- 4524,4533 ----
  6117.   /*
  6118.    * Handle ":syntax keyword {group-name} [{option}] keyword .." command.
  6119.    */
  6120.       static void
  6121.   syn_cmd_keyword(eap, syncing)
  6122.       exarg_T    *eap;
  6123. !     int        syncing UNUSED;
  6124.   {
  6125.       char_u    *arg = eap->arg;
  6126.       char_u    *group_name_end;
  6127. ***************
  6128. *** 5275,5285 ****
  6129.    * Handle ":syntax cluster {cluster-name} [contains={groupname},..]
  6130.    *        [add={groupname},..] [remove={groupname},..]".
  6131.    */
  6132. - /* ARGSUSED */
  6133.       static void
  6134.   syn_cmd_cluster(eap, syncing)
  6135.       exarg_T    *eap;
  6136. !     int        syncing;        /* not used */
  6137.   {
  6138.       char_u    *arg = eap->arg;
  6139.       char_u    *group_name_end;
  6140. --- 5266,5275 ----
  6141.    * Handle ":syntax cluster {cluster-name} [contains={groupname},..]
  6142.    *        [add={groupname},..] [remove={groupname},..]".
  6143.    */
  6144.       static void
  6145.   syn_cmd_cluster(eap, syncing)
  6146.       exarg_T    *eap;
  6147. !     int        syncing UNUSED;
  6148.   {
  6149.       char_u    *arg = eap->arg;
  6150.       char_u    *group_name_end;
  6151. ***************
  6152. *** 5464,5474 ****
  6153.   /*
  6154.    * Handle ":syntax sync .." command.
  6155.    */
  6156. - /* ARGSUSED */
  6157.       static void
  6158.   syn_cmd_sync(eap, syncing)
  6159.       exarg_T    *eap;
  6160. !     int        syncing;        /* not used */
  6161.   {
  6162.       char_u    *arg_start = eap->arg;
  6163.       char_u    *arg_end;
  6164. --- 5454,5463 ----
  6165.   /*
  6166.    * Handle ":syntax sync .." command.
  6167.    */
  6168.       static void
  6169.   syn_cmd_sync(eap, syncing)
  6170.       exarg_T    *eap;
  6171. !     int        syncing UNUSED;
  6172.   {
  6173.       char_u    *arg_start = eap->arg;
  6174.       char_u    *arg_end;
  6175. ***************
  6176. *** 6099,6108 ****
  6177.    * Function given to ExpandGeneric() to obtain the list syntax names for
  6178.    * expansion.
  6179.    */
  6180. - /*ARGSUSED*/
  6181.       char_u *
  6182.   get_syntax_name(xp, idx)
  6183. !     expand_T    *xp;
  6184.       int        idx;
  6185.   {
  6186.       if (expand_what == EXP_SUBCMD)
  6187. --- 6088,6096 ----
  6188.    * Function given to ExpandGeneric() to obtain the list syntax names for
  6189.    * expansion.
  6190.    */
  6191.       char_u *
  6192.   get_syntax_name(xp, idx)
  6193. !     expand_T    *xp UNUSED;
  6194.       int        idx;
  6195.   {
  6196.       if (expand_what == EXP_SUBCMD)
  6197. ***************
  6198. *** 7744,7757 ****
  6199.   /*
  6200.    * Get the font or fontset for one highlight group.
  6201.    */
  6202. - /*ARGSUSED*/
  6203.       static void
  6204.   hl_do_font(idx, arg, do_normal, do_menu, do_tooltip)
  6205.       int        idx;
  6206.       char_u    *arg;
  6207. !     int        do_normal;    /* set normal font */
  6208. !     int        do_menu;    /* set menu font */
  6209. !     int        do_tooltip;    /* set tooltip font */
  6210.   {
  6211.   # ifdef FEAT_XFONTSET
  6212.       /* If 'guifontset' is not empty, first try using the name as a
  6213. --- 7732,7744 ----
  6214.   /*
  6215.    * Get the font or fontset for one highlight group.
  6216.    */
  6217.       static void
  6218.   hl_do_font(idx, arg, do_normal, do_menu, do_tooltip)
  6219.       int        idx;
  6220.       char_u    *arg;
  6221. !     int        do_normal;        /* set normal font */
  6222. !     int        do_menu UNUSED;        /* set menu font */
  6223. !     int        do_tooltip UNUSED;    /* set tooltip font */
  6224.   {
  6225.   # ifdef FEAT_XFONTSET
  6226.       /* If 'guifontset' is not empty, first try using the name as a
  6227. ***************
  6228. *** 9150,9159 ****
  6229.    * Function given to ExpandGeneric() to obtain the list of group names.
  6230.    * Also used for synIDattr() function.
  6231.    */
  6232. - /*ARGSUSED*/
  6233.       char_u *
  6234.   get_highlight_name(xp, idx)
  6235. !     expand_T    *xp;
  6236.       int        idx;
  6237.   {
  6238.   #ifdef FEAT_CMDL_COMPL
  6239. --- 9137,9145 ----
  6240.    * Function given to ExpandGeneric() to obtain the list of group names.
  6241.    * Also used for synIDattr() function.
  6242.    */
  6243.       char_u *
  6244.   get_highlight_name(xp, idx)
  6245. !     expand_T    *xp UNUSED;
  6246.       int        idx;
  6247.   {
  6248.   #ifdef FEAT_CMDL_COMPL
  6249. *** ../vim-7.2.179/src/tag.c    2009-05-15 21:31:11.000000000 +0200
  6250. --- src/tag.c    2009-05-16 22:16:31.000000000 +0200
  6251. ***************
  6252. *** 100,106 ****
  6253.    * Tag for preview window is remembered separately, to avoid messing up the
  6254.    * normal tagstack.
  6255.    */
  6256. ! static taggy_T ptag_entry = {NULL};
  6257.   #endif
  6258.   
  6259.   /*
  6260. --- 100,106 ----
  6261.    * Tag for preview window is remembered separately, to avoid messing up the
  6262.    * normal tagstack.
  6263.    */
  6264. ! static taggy_T ptag_entry = {NULL, {INIT_POS_T(0, 0, 0), 0}, 0, 0};
  6265.   #endif
  6266.   
  6267.   /*
  6268. ***************
  6269. *** 3791,3797 ****
  6270.           --end;
  6271.       }
  6272.       len = (int)(end - start);
  6273. !     if (len > sizeof(buf) - 1)
  6274.           len = sizeof(buf) - 1;
  6275.       vim_strncpy(buf, start, len);
  6276.       }
  6277. --- 3791,3797 ----
  6278.           --end;
  6279.       }
  6280.       len = (int)(end - start);
  6281. !     if (len > (int)sizeof(buf) - 1)
  6282.           len = sizeof(buf) - 1;
  6283.       vim_strncpy(buf, start, len);
  6284.       }
  6285. *** ../vim-7.2.179/src/term.c    2009-01-22 18:32:55.000000000 +0100
  6286. --- src/term.c    2009-05-16 22:18:08.000000000 +0200
  6287. ***************
  6288. *** 2906,2912 ****
  6289.       int        i;
  6290.       int        shift;
  6291.   
  6292. !     for (i = 1; i <= sizeof(long_u); i++)
  6293.       {
  6294.       shift = 8 * (sizeof(long_u) - i);
  6295.       dst[i - 1] = (char_u) ((val >> shift) & 0xff);
  6296. --- 2906,2912 ----
  6297.       int        i;
  6298.       int        shift;
  6299.   
  6300. !     for (i = 1; i <= (int)sizeof(long_u); i++)
  6301.       {
  6302.       shift = 8 * (sizeof(long_u) - i);
  6303.       dst[i - 1] = (char_u) ((val >> shift) & 0xff);
  6304. ***************
  6305. *** 2937,2943 ****
  6306.       len = get_bytes_from_buf(buf, bytes, (int)sizeof(long_u));
  6307.       if (len != -1)
  6308.       {
  6309. !     for (i = 0; i < sizeof(long_u); i++)
  6310.       {
  6311.           shift = 8 * (sizeof(long_u) - 1 - i);
  6312.           *val += (long_u)bytes[i] << shift;
  6313. --- 2937,2943 ----
  6314.       len = get_bytes_from_buf(buf, bytes, (int)sizeof(long_u));
  6315.       if (len != -1)
  6316.       {
  6317. !     for (i = 0; i < (int)sizeof(long_u); i++)
  6318.       {
  6319.           shift = 8 * (sizeof(long_u) - 1 - i);
  6320.           *val += (long_u)bytes[i] << shift;
  6321. *** ../vim-7.2.179/src/ui.c    2008-11-28 21:26:50.000000000 +0100
  6322. --- src/ui.c    2009-05-16 22:33:55.000000000 +0200
  6323. ***************
  6324. *** 320,329 ****
  6325.    * The gui_set_shellsize() or mch_set_shellsize() function will try to set the
  6326.    * new size.  If this is not possible, it will adjust Rows and Columns.
  6327.    */
  6328. - /*ARGSUSED*/
  6329.       void
  6330.   ui_set_shellsize(mustset)
  6331. !     int        mustset;    /* set by the user */
  6332.   {
  6333.   #ifdef FEAT_GUI
  6334.       if (gui.in_use)
  6335. --- 320,328 ----
  6336.    * The gui_set_shellsize() or mch_set_shellsize() function will try to set the
  6337.    * new size.  If this is not possible, it will adjust Rows and Columns.
  6338.    */
  6339.       void
  6340.   ui_set_shellsize(mustset)
  6341. !     int        mustset UNUSED;    /* set by the user */
  6342.   {
  6343.   #ifdef FEAT_GUI
  6344.       if (gui.in_use)
  6345. ***************
  6346. *** 1127,1136 ****
  6347.    * available for pasting.
  6348.    * When "both" is TRUE also copy to the '+' register.
  6349.    */
  6350. - /*ARGSUSED*/
  6351.       void
  6352.   clip_copy_modeless_selection(both)
  6353. !     int        both;
  6354.   {
  6355.       char_u    *buffer;
  6356.       char_u    *bufp;
  6357. --- 1126,1134 ----
  6358.    * available for pasting.
  6359.    * When "both" is TRUE also copy to the '+' register.
  6360.    */
  6361.       void
  6362.   clip_copy_modeless_selection(both)
  6363. !     int        both UNUSED;
  6364.   {
  6365.       char_u    *buffer;
  6366.       char_u    *bufp;
  6367. ***************
  6368. *** 1701,1710 ****
  6369.       return (int)maxlen;
  6370.   }
  6371.   
  6372. - /*ARGSUSED*/
  6373.       void
  6374.   fill_input_buf(exit_on_error)
  6375. !     int    exit_on_error;
  6376.   {
  6377.   #if defined(UNIX) || defined(OS2) || defined(VMS) || defined(MACOS_X_UNIX)
  6378.       int        len;
  6379. --- 1699,1707 ----
  6380.       return (int)maxlen;
  6381.   }
  6382.   
  6383.       void
  6384.   fill_input_buf(exit_on_error)
  6385. !     int    exit_on_error UNUSED;
  6386.   {
  6387.   #if defined(UNIX) || defined(OS2) || defined(VMS) || defined(MACOS_X_UNIX)
  6388.       int        len;
  6389. ***************
  6390. *** 1992,2002 ****
  6391.   
  6392.   static void  clip_x11_request_selection_cb __ARGS((Widget, XtPointer, Atom *, Atom *, XtPointer, long_u *, int *));
  6393.   
  6394. - /* ARGSUSED */
  6395.       static void
  6396.   clip_x11_request_selection_cb(w, success, sel_atom, type, value, length,
  6397.                     format)
  6398. !     Widget    w;
  6399.       XtPointer    success;
  6400.       Atom    *sel_atom;
  6401.       Atom    *type;
  6402. --- 1989,1998 ----
  6403.   
  6404.   static void  clip_x11_request_selection_cb __ARGS((Widget, XtPointer, Atom *, Atom *, XtPointer, long_u *, int *));
  6405.   
  6406.       static void
  6407.   clip_x11_request_selection_cb(w, success, sel_atom, type, value, length,
  6408.                     format)
  6409. !     Widget    w UNUSED;
  6410.       XtPointer    success;
  6411.       Atom    *sel_atom;
  6412.       Atom    *type;
  6413. ***************
  6414. *** 2202,2211 ****
  6415.   
  6416.   static Boolean    clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
  6417.   
  6418. - /* ARGSUSED */
  6419.       static Boolean
  6420.   clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format)
  6421. !     Widget    w;
  6422.       Atom    *sel_atom;
  6423.       Atom    *target;
  6424.       Atom    *type;
  6425. --- 2198,2206 ----
  6426.   
  6427.   static Boolean    clip_x11_convert_selection_cb __ARGS((Widget, Atom *, Atom *, Atom *, XtPointer *, long_u *, int *));
  6428.   
  6429.       static Boolean
  6430.   clip_x11_convert_selection_cb(w, sel_atom, target, type, value, length, format)
  6431. !     Widget    w UNUSED;
  6432.       Atom    *sel_atom;
  6433.       Atom    *target;
  6434.       Atom    *type;
  6435. ***************
  6436. *** 2332,2341 ****
  6437.   
  6438.   static void  clip_x11_lose_ownership_cb __ARGS((Widget, Atom *));
  6439.   
  6440. - /* ARGSUSED */
  6441.       static void
  6442.   clip_x11_lose_ownership_cb(w, sel_atom)
  6443. !     Widget  w;
  6444.       Atom    *sel_atom;
  6445.   {
  6446.       if (*sel_atom == clip_plus.sel_atom)
  6447. --- 2327,2335 ----
  6448.   
  6449.   static void  clip_x11_lose_ownership_cb __ARGS((Widget, Atom *));
  6450.   
  6451.       static void
  6452.   clip_x11_lose_ownership_cb(w, sel_atom)
  6453. !     Widget  w UNUSED;
  6454.       Atom    *sel_atom;
  6455.   {
  6456.       if (*sel_atom == clip_plus.sel_atom)
  6457. ***************
  6458. *** 2368,2377 ****
  6459.    * Send the current selection to the clipboard.  Do nothing for X because we
  6460.    * will fill in the selection only when requested by another app.
  6461.    */
  6462. - /*ARGSUSED*/
  6463.       void
  6464.   clip_x11_set_selection(cbd)
  6465. !     VimClipboard *cbd;
  6466.   {
  6467.   }
  6468.   #endif
  6469. --- 2362,2370 ----
  6470.    * Send the current selection to the clipboard.  Do nothing for X because we
  6471.    * will fill in the selection only when requested by another app.
  6472.    */
  6473.       void
  6474.   clip_x11_set_selection(cbd)
  6475. !     VimClipboard *cbd UNUSED;
  6476.   {
  6477.   }
  6478.   #endif
  6479. ***************
  6480. *** 2922,2932 ****
  6481.    * Find the window at screen position "*rowp" and "*colp".  The positions are
  6482.    * updated to become relative to the top-left of the window.
  6483.    */
  6484. - /*ARGSUSED*/
  6485.       win_T *
  6486.   mouse_find_win(rowp, colp)
  6487.       int        *rowp;
  6488. !     int        *colp;
  6489.   {
  6490.       frame_T    *fp;
  6491.   
  6492. --- 2915,2924 ----
  6493.    * Find the window at screen position "*rowp" and "*colp".  The positions are
  6494.    * updated to become relative to the top-left of the window.
  6495.    */
  6496.       win_T *
  6497.   mouse_find_win(rowp, colp)
  6498.       int        *rowp;
  6499. !     int        *colp UNUSED;
  6500.   {
  6501.       frame_T    *fp;
  6502.   
  6503. *** ../vim-7.2.179/src/version.c    2009-05-16 21:16:12.000000000 +0200
  6504. --- src/version.c    2009-05-17 13:06:38.000000000 +0200
  6505. ***************
  6506. *** 678,679 ****
  6507. --- 678,681 ----
  6508.   {   /* Add new patch number below this line */
  6509. + /**/
  6510. +     180,
  6511.   /**/
  6512.  
  6513. -- 
  6514. Wi n0t trei a h0liday in Sweden thi yer?
  6515.                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
  6516.  
  6517.  /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
  6518. ///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
  6519. \\\        download, build and distribute -- http://www.A-A-P.org        ///
  6520.  \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
  6521.