|
 |
290abfa |
To: vim_dev@googlegroups.com
|
|
|
290abfa |
Subject: Patch 7.4.749
|
|
|
290abfa |
Fcc: outbox
|
|
|
290abfa |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
290abfa |
Mime-Version: 1.0
|
|
|
290abfa |
Content-Type: text/plain; charset=UTF-8
|
|
|
290abfa |
Content-Transfer-Encoding: 8bit
|
|
|
290abfa |
------------
|
|
|
290abfa |
|
|
|
290abfa |
Patch 7.4.749 (after 7.4.741)
|
|
|
290abfa |
Problem: For some options two consecutive commas are OK. (Nikolay Pavlov)
|
|
|
290abfa |
Solution: Add the P_ONECOMMA flag.
|
|
|
290abfa |
Files: src/option.c
|
|
|
290abfa |
|
|
|
290abfa |
|
|
|
290abfa |
*** ../vim-7.4.748/src/option.c 2015-06-19 14:06:29.043993697 +0200
|
|
|
290abfa |
--- src/option.c 2015-06-20 15:00:14.345351620 +0200
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 439,457 ****
|
|
|
290abfa |
#define P_RALL 0x6000 /* redraw all windows */
|
|
|
290abfa |
#define P_RCLR 0x7000 /* clear and redraw all */
|
|
|
290abfa |
|
|
|
290abfa |
! #define P_COMMA 0x8000 /* comma separated list */
|
|
|
290abfa |
! #define P_NODUP 0x10000L /* don't allow duplicate strings */
|
|
|
290abfa |
! #define P_FLAGLIST 0x20000L /* list of single-char flags */
|
|
|
290abfa |
!
|
|
|
290abfa |
! #define P_SECURE 0x40000L /* cannot change in modeline or secure mode */
|
|
|
290abfa |
! #define P_GETTEXT 0x80000L /* expand default value with _() */
|
|
|
290abfa |
! #define P_NOGLOB 0x100000L /* do not use local value for global vimrc */
|
|
|
290abfa |
! #define P_NFNAME 0x200000L /* only normal file name chars allowed */
|
|
|
290abfa |
! #define P_INSECURE 0x400000L /* option was set from a modeline */
|
|
|
290abfa |
! #define P_PRI_MKRC 0x800000L /* priority for :mkvimrc (setting option has
|
|
|
290abfa |
side effects) */
|
|
|
290abfa |
! #define P_NO_ML 0x1000000L /* not allowed in modeline */
|
|
|
290abfa |
! #define P_CURSWANT 0x2000000L /* update curswant required; not needed when
|
|
|
290abfa |
* there is a redraw flag */
|
|
|
290abfa |
|
|
|
290abfa |
#define ISK_LATIN1 (char_u *)"@,48-57,_,192-255"
|
|
|
290abfa |
--- 439,459 ----
|
|
|
290abfa |
#define P_RALL 0x6000 /* redraw all windows */
|
|
|
290abfa |
#define P_RCLR 0x7000 /* clear and redraw all */
|
|
|
290abfa |
|
|
|
290abfa |
! #define P_COMMA 0x8000 /* comma separated list */
|
|
|
290abfa |
! #define P_ONECOMMA 0x18000L /* P_COMMA and cannot have two consecutive
|
|
|
290abfa |
! * commas */
|
|
|
290abfa |
! #define P_NODUP 0x20000L /* don't allow duplicate strings */
|
|
|
290abfa |
! #define P_FLAGLIST 0x40000L /* list of single-char flags */
|
|
|
290abfa |
!
|
|
|
290abfa |
! #define P_SECURE 0x80000L /* cannot change in modeline or secure mode */
|
|
|
290abfa |
! #define P_GETTEXT 0x100000L /* expand default value with _() */
|
|
|
290abfa |
! #define P_NOGLOB 0x200000L /* do not use local value for global vimrc */
|
|
|
290abfa |
! #define P_NFNAME 0x400000L /* only normal file name chars allowed */
|
|
|
290abfa |
! #define P_INSECURE 0x800000L /* option was set from a modeline */
|
|
|
290abfa |
! #define P_PRI_MKRC 0x1000000L /* priority for :mkvimrc (setting option has
|
|
|
290abfa |
side effects) */
|
|
|
290abfa |
! #define P_NO_ML 0x2000000L /* not allowed in modeline */
|
|
|
290abfa |
! #define P_CURSWANT 0x4000000L /* update curswant required; not needed when
|
|
|
290abfa |
* there is a redraw flag */
|
|
|
290abfa |
|
|
|
290abfa |
#define ISK_LATIN1 (char_u *)"@,48-57,_,192-255"
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 576,588 ****
|
|
|
290abfa |
(char_u *)"light",
|
|
|
290abfa |
#endif
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"backspace", "bs", P_STRING|P_VI_DEF|P_VIM|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_bs, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"backup", "bk", P_BOOL|P_VI_DEF|P_VIM,
|
|
|
290abfa |
(char_u *)&p_bk, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"backupcopy", "bkc", P_STRING|P_VIM|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_bkc, PV_BKC,
|
|
|
290abfa |
#ifdef UNIX
|
|
|
290abfa |
{(char_u *)"yes", (char_u *)"auto"}
|
|
|
290abfa |
--- 578,590 ----
|
|
|
290abfa |
(char_u *)"light",
|
|
|
290abfa |
#endif
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"backspace", "bs", P_STRING|P_VI_DEF|P_VIM|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_bs, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"backup", "bk", P_BOOL|P_VI_DEF|P_VIM,
|
|
|
290abfa |
(char_u *)&p_bk, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"backupcopy", "bkc", P_STRING|P_VIM|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_bkc, PV_BKC,
|
|
|
290abfa |
#ifdef UNIX
|
|
|
290abfa |
{(char_u *)"yes", (char_u *)"auto"}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 590,596 ****
|
|
|
290abfa |
{(char_u *)"auto", (char_u *)"auto"}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
|
|
|
290abfa |
(char_u *)&p_bdir, PV_NONE,
|
|
|
290abfa |
{(char_u *)DFLT_BDIR, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"backupext", "bex", P_STRING|P_VI_DEF|P_NFNAME,
|
|
|
290abfa |
--- 592,599 ----
|
|
|
290abfa |
{(char_u *)"auto", (char_u *)"auto"}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA
|
|
|
290abfa |
! |P_NODUP|P_SECURE,
|
|
|
290abfa |
(char_u *)&p_bdir, PV_NONE,
|
|
|
290abfa |
{(char_u *)DFLT_BDIR, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"backupext", "bex", P_STRING|P_VI_DEF|P_NFNAME,
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 602,608 ****
|
|
|
290abfa |
(char_u *)"~",
|
|
|
290abfa |
#endif
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"backupskip", "bsk", P_STRING|P_VI_DEF|P_COMMA,
|
|
|
290abfa |
#ifdef FEAT_WILDIGN
|
|
|
290abfa |
(char_u *)&p_bsk, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
--- 605,611 ----
|
|
|
290abfa |
(char_u *)"~",
|
|
|
290abfa |
#endif
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"backupskip", "bsk", P_STRING|P_VI_DEF|P_ONECOMMA,
|
|
|
290abfa |
#ifdef FEAT_WILDIGN
|
|
|
290abfa |
(char_u *)&p_bsk, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 662,668 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"breakindentopt", "briopt", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_LINEBREAK
|
|
|
290abfa |
(char_u *)VAR_WIN, PV_BRIOPT,
|
|
|
290abfa |
{(char_u *)"", (char_u *)NULL}
|
|
|
290abfa |
--- 665,672 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"breakindentopt", "briopt", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF
|
|
|
290abfa |
! |P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_LINEBREAK
|
|
|
290abfa |
(char_u *)VAR_WIN, PV_BRIOPT,
|
|
|
290abfa |
{(char_u *)"", (char_u *)NULL}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 702,708 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"casemap", "cmp", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_MBYTE
|
|
|
290abfa |
(char_u *)&p_cmp, PV_NONE,
|
|
|
290abfa |
{(char_u *)"internal,keepascii", (char_u *)0L}
|
|
|
290abfa |
--- 706,712 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"casemap", "cmp", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_MBYTE
|
|
|
290abfa |
(char_u *)&p_cmp, PV_NONE,
|
|
|
290abfa |
{(char_u *)"internal,keepascii", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 745,751 ****
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_CINDENT
|
|
|
290abfa |
(char_u *)&p_cink, PV_CINK,
|
|
|
290abfa |
{(char_u *)"0{,0},0),:,0#,!^F,o,O,e", (char_u *)0L}
|
|
|
290abfa |
--- 749,755 ----
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_CINDENT
|
|
|
290abfa |
(char_u *)&p_cink, PV_CINK,
|
|
|
290abfa |
{(char_u *)"0{,0},0),:,0#,!^F,o,O,e", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 754,767 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_CINDENT
|
|
|
290abfa |
(char_u *)&p_cino, PV_CINO,
|
|
|
290abfa |
#else
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
|
|
|
290abfa |
(char_u *)&p_cinw, PV_CINW,
|
|
|
290abfa |
{(char_u *)"if,else,while,do,for,switch",
|
|
|
290abfa |
--- 758,771 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_CINDENT
|
|
|
290abfa |
(char_u *)&p_cino, PV_CINO,
|
|
|
290abfa |
#else
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
|
|
|
290abfa |
(char_u *)&p_cinw, PV_CINW,
|
|
|
290abfa |
{(char_u *)"if,else,while,do,for,switch",
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 771,777 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"clipboard", "cb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_CLIPBOARD
|
|
|
290abfa |
(char_u *)&p_cb, PV_NONE,
|
|
|
290abfa |
# ifdef FEAT_XCLIPBOARD
|
|
|
290abfa |
--- 775,781 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"clipboard", "cb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_CLIPBOARD
|
|
|
290abfa |
(char_u *)&p_cb, PV_NONE,
|
|
|
290abfa |
# ifdef FEAT_XCLIPBOARD
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 795,801 ****
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)7L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"colorcolumn", "cc", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_RWIN,
|
|
|
290abfa |
#ifdef FEAT_SYN_HL
|
|
|
290abfa |
(char_u *)VAR_WIN, PV_CC,
|
|
|
290abfa |
#else
|
|
|
290abfa |
--- 799,805 ----
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)7L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"colorcolumn", "cc", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN,
|
|
|
290abfa |
#ifdef FEAT_SYN_HL
|
|
|
290abfa |
(char_u *)VAR_WIN, PV_CC,
|
|
|
290abfa |
#else
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 805,811 ****
|
|
|
290abfa |
{"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
|
|
|
290abfa |
(char_u *)&Columns, PV_NONE,
|
|
|
290abfa |
{(char_u *)80L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP|P_CURSWANT,
|
|
|
290abfa |
#ifdef FEAT_COMMENTS
|
|
|
290abfa |
(char_u *)&p_com, PV_COM,
|
|
|
290abfa |
{(char_u *)"s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-",
|
|
|
290abfa |
--- 809,816 ----
|
|
|
290abfa |
{"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
|
|
|
290abfa |
(char_u *)&Columns, PV_NONE,
|
|
|
290abfa |
{(char_u *)80L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA
|
|
|
290abfa |
! |P_NODUP|P_CURSWANT,
|
|
|
290abfa |
#ifdef FEAT_COMMENTS
|
|
|
290abfa |
(char_u *)&p_com, PV_COM,
|
|
|
290abfa |
{(char_u *)"s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-",
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 829,835 ****
|
|
|
290abfa |
{"compatible", "cp", P_BOOL|P_RALL,
|
|
|
290abfa |
(char_u *)&p_cp, PV_NONE,
|
|
|
290abfa |
{(char_u *)TRUE, (char_u *)FALSE} SCRIPTID_INIT},
|
|
|
290abfa |
! {"complete", "cpt", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_INS_EXPAND
|
|
|
290abfa |
(char_u *)&p_cpt, PV_CPT,
|
|
|
290abfa |
{(char_u *)".,w,b,u,t,i", (char_u *)0L}
|
|
|
290abfa |
--- 834,840 ----
|
|
|
290abfa |
{"compatible", "cp", P_BOOL|P_RALL,
|
|
|
290abfa |
(char_u *)&p_cp, PV_NONE,
|
|
|
290abfa |
{(char_u *)TRUE, (char_u *)FALSE} SCRIPTID_INIT},
|
|
|
290abfa |
! {"complete", "cpt", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_INS_EXPAND
|
|
|
290abfa |
(char_u *)&p_cpt, PV_CPT,
|
|
|
290abfa |
{(char_u *)".,w,b,u,t,i", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 864,870 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"completeopt", "cot", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_INS_EXPAND
|
|
|
290abfa |
(char_u *)&p_cot, PV_NONE,
|
|
|
290abfa |
{(char_u *)"menu,preview", (char_u *)0L}
|
|
|
290abfa |
--- 869,875 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"completeopt", "cot", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_INS_EXPAND
|
|
|
290abfa |
(char_u *)&p_cot, PV_NONE,
|
|
|
290abfa |
{(char_u *)"menu,preview", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 919,925 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"cscopequickfix", "csqf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX)
|
|
|
290abfa |
(char_u *)&p_csqf, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
--- 924,930 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"cscopequickfix", "csqf", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX)
|
|
|
290abfa |
(char_u *)&p_csqf, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 996,1002 ****
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_INS_EXPAND
|
|
|
290abfa |
(char_u *)&p_dict, PV_DICT,
|
|
|
290abfa |
#else
|
|
|
290abfa |
--- 1001,1007 ----
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_INS_EXPAND
|
|
|
290abfa |
(char_u *)&p_dict, PV_DICT,
|
|
|
290abfa |
#else
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1019,1025 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_DIFF
|
|
|
290abfa |
(char_u *)&p_dip, PV_NONE,
|
|
|
290abfa |
{(char_u *)"filler", (char_u *)NULL}
|
|
|
290abfa |
--- 1024,1031 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_ONECOMMA
|
|
|
290abfa |
! |P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_DIFF
|
|
|
290abfa |
(char_u *)&p_dip, PV_NONE,
|
|
|
290abfa |
{(char_u *)"filler", (char_u *)NULL}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1035,1044 ****
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"directory", "dir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
|
|
|
290abfa |
(char_u *)&p_dir, PV_NONE,
|
|
|
290abfa |
{(char_u *)DFLT_DIR, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"display", "dy", P_STRING|P_VI_DEF|P_COMMA|P_RALL|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_dy, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"eadirection", "ead", P_STRING|P_VI_DEF,
|
|
|
290abfa |
--- 1041,1051 ----
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"directory", "dir", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA
|
|
|
290abfa |
! |P_NODUP|P_SECURE,
|
|
|
290abfa |
(char_u *)&p_dir, PV_NONE,
|
|
|
290abfa |
{(char_u *)DFLT_DIR, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"display", "dy", P_STRING|P_VI_DEF|P_ONECOMMA|P_RALL|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_dy, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"eadirection", "ead", P_STRING|P_VI_DEF,
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1083,1089 ****
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"errorformat", "efm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_QUICKFIX
|
|
|
290abfa |
(char_u *)&p_efm, PV_EFM,
|
|
|
290abfa |
{(char_u *)DFLT_EFM, (char_u *)0L}
|
|
|
290abfa |
--- 1090,1096 ----
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"errorformat", "efm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_QUICKFIX
|
|
|
290abfa |
(char_u *)&p_efm, PV_EFM,
|
|
|
290abfa |
{(char_u *)DFLT_EFM, (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1095,1101 ****
|
|
|
290abfa |
{"esckeys", "ek", P_BOOL|P_VIM,
|
|
|
290abfa |
(char_u *)&p_ek, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
|
|
|
290abfa |
! {"eventignore", "ei", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_AUTOCMD
|
|
|
290abfa |
(char_u *)&p_ei, PV_NONE,
|
|
|
290abfa |
#else
|
|
|
290abfa |
--- 1102,1108 ----
|
|
|
290abfa |
{"esckeys", "ek", P_BOOL|P_VIM,
|
|
|
290abfa |
(char_u *)&p_ek, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
|
|
|
290abfa |
! {"eventignore", "ei", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_AUTOCMD
|
|
|
290abfa |
(char_u *)&p_ei, PV_NONE,
|
|
|
290abfa |
#else
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1108,1114 ****
|
|
|
290abfa |
{"exrc", "ex", P_BOOL|P_VI_DEF|P_SECURE,
|
|
|
290abfa |
(char_u *)&p_exrc, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF|P_NO_MKRC,
|
|
|
290abfa |
#ifdef FEAT_MBYTE
|
|
|
290abfa |
(char_u *)&p_fenc, PV_FENC,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
--- 1115,1122 ----
|
|
|
290abfa |
{"exrc", "ex", P_BOOL|P_VI_DEF|P_SECURE,
|
|
|
290abfa |
(char_u *)&p_exrc, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF
|
|
|
290abfa |
! |P_NO_MKRC,
|
|
|
290abfa |
#ifdef FEAT_MBYTE
|
|
|
290abfa |
(char_u *)&p_fenc, PV_FENC,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1117,1123 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"fileencodings","fencs", P_STRING|P_VI_DEF|P_COMMA,
|
|
|
290abfa |
#ifdef FEAT_MBYTE
|
|
|
290abfa |
(char_u *)&p_fencs, PV_NONE,
|
|
|
290abfa |
{(char_u *)"ucs-bom", (char_u *)0L}
|
|
|
290abfa |
--- 1125,1131 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"fileencodings","fencs", P_STRING|P_VI_DEF|P_ONECOMMA,
|
|
|
290abfa |
#ifdef FEAT_MBYTE
|
|
|
290abfa |
(char_u *)&p_fencs, PV_NONE,
|
|
|
290abfa |
{(char_u *)"ucs-bom", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1126,1135 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"fileformat", "ff", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC|P_CURSWANT,
|
|
|
290abfa |
(char_u *)&p_ff, PV_FF,
|
|
|
290abfa |
{(char_u *)DFLT_FF, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"fileformats", "ffs", P_STRING|P_VIM|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_ffs, PV_NONE,
|
|
|
290abfa |
{(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
--- 1134,1144 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"fileformat", "ff", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC
|
|
|
290abfa |
! |P_CURSWANT,
|
|
|
290abfa |
(char_u *)&p_ff, PV_FF,
|
|
|
290abfa |
{(char_u *)DFLT_FF, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"fileformats", "ffs", P_STRING|P_VIM|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_ffs, PV_NONE,
|
|
|
290abfa |
{(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1151,1157 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"fillchars", "fcs", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
|
|
|
290abfa |
#if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING)
|
|
|
290abfa |
(char_u *)&p_fcs, PV_NONE,
|
|
|
290abfa |
{(char_u *)"vert:|,fold:-", (char_u *)0L}
|
|
|
290abfa |
--- 1160,1166 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"fillchars", "fcs", P_STRING|P_VI_DEF|P_RALL|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING)
|
|
|
290abfa |
(char_u *)&p_fcs, PV_NONE,
|
|
|
290abfa |
{(char_u *)"vert:|,fold:-", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1171,1177 ****
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
#ifdef FEAT_FOLDING
|
|
|
290abfa |
! {"foldclose", "fcl", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_RWIN,
|
|
|
290abfa |
(char_u *)&p_fcl, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"foldcolumn", "fdc", P_NUM|P_VI_DEF|P_RWIN,
|
|
|
290abfa |
--- 1180,1186 ----
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
#ifdef FEAT_FOLDING
|
|
|
290abfa |
! {"foldclose", "fcl", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN,
|
|
|
290abfa |
(char_u *)&p_fcl, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"foldcolumn", "fdc", P_NUM|P_VI_DEF|P_RWIN,
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1199,1205 ****
|
|
|
290abfa |
(char_u *)&p_fdls, PV_NONE,
|
|
|
290abfa |
{(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|
|
|
|
290abfa |
! P_RWIN|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)VAR_WIN, PV_FMR,
|
|
|
290abfa |
{(char_u *)"{{{,}}}", (char_u *)NULL}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
--- 1208,1214 ----
|
|
|
290abfa |
(char_u *)&p_fdls, PV_NONE,
|
|
|
290abfa |
{(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|
|
|
|
290abfa |
! P_RWIN|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)VAR_WIN, PV_FMR,
|
|
|
290abfa |
{(char_u *)"{{{,}}}", (char_u *)NULL}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1212,1218 ****
|
|
|
290abfa |
{"foldnestmax", "fdn", P_NUM|P_VI_DEF|P_RWIN,
|
|
|
290abfa |
(char_u *)VAR_WIN, PV_FDN,
|
|
|
290abfa |
{(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"foldopen", "fdo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_CURSWANT,
|
|
|
290abfa |
(char_u *)&p_fdo, PV_NONE,
|
|
|
290abfa |
{(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo",
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
--- 1221,1227 ----
|
|
|
290abfa |
{"foldnestmax", "fdn", P_NUM|P_VI_DEF|P_RWIN,
|
|
|
290abfa |
(char_u *)VAR_WIN, PV_FDN,
|
|
|
290abfa |
{(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"foldopen", "fdo", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_CURSWANT,
|
|
|
290abfa |
(char_u *)&p_fdo, PV_NONE,
|
|
|
290abfa |
{(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo",
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1261,1267 ****
|
|
|
290abfa |
{"graphic", "gr", P_BOOL|P_VI_DEF,
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"grepformat", "gfm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_QUICKFIX
|
|
|
290abfa |
(char_u *)&p_gefm, PV_NONE,
|
|
|
290abfa |
{(char_u *)DFLT_GREPFORMAT, (char_u *)0L}
|
|
|
290abfa |
--- 1270,1276 ----
|
|
|
290abfa |
{"graphic", "gr", P_BOOL|P_VI_DEF,
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"grepformat", "gfm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_QUICKFIX
|
|
|
290abfa |
(char_u *)&p_gefm, PV_NONE,
|
|
|
290abfa |
{(char_u *)DFLT_GREPFORMAT, (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1296,1302 ****
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"guicursor", "gcr", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef CURSOR_SHAPE
|
|
|
290abfa |
(char_u *)&p_guicursor, PV_NONE,
|
|
|
290abfa |
{
|
|
|
290abfa |
--- 1305,1311 ----
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"guicursor", "gcr", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef CURSOR_SHAPE
|
|
|
290abfa |
(char_u *)&p_guicursor, PV_NONE,
|
|
|
290abfa |
{
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1311,1317 ****
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"guifont", "gfn", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_GUI
|
|
|
290abfa |
(char_u *)&p_guifont, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
--- 1320,1326 ----
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"guifont", "gfn", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_GUI
|
|
|
290abfa |
(char_u *)&p_guifont, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1320,1326 ****
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"guifontset", "gfs", P_STRING|P_VI_DEF|P_RCLR|P_COMMA,
|
|
|
290abfa |
#if defined(FEAT_GUI) && defined(FEAT_XFONTSET)
|
|
|
290abfa |
(char_u *)&p_guifontset, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
--- 1329,1335 ----
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"guifontset", "gfs", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA,
|
|
|
290abfa |
#if defined(FEAT_GUI) && defined(FEAT_XFONTSET)
|
|
|
290abfa |
(char_u *)&p_guifontset, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1329,1335 ****
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"guifontwide", "gfw", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
|
|
|
290abfa |
#if defined(FEAT_GUI) && defined(FEAT_MBYTE)
|
|
|
290abfa |
(char_u *)&p_guifontwide, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
--- 1338,1344 ----
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"guifontwide", "gfw", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#if defined(FEAT_GUI) && defined(FEAT_MBYTE)
|
|
|
290abfa |
(char_u *)&p_guifontwide, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1397,1403 ****
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"helplang", "hlg", P_STRING|P_VI_DEF|P_COMMA,
|
|
|
290abfa |
#ifdef FEAT_MULTI_LANG
|
|
|
290abfa |
(char_u *)&p_hlg, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
--- 1406,1412 ----
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"helplang", "hlg", P_STRING|P_VI_DEF|P_ONECOMMA,
|
|
|
290abfa |
#ifdef FEAT_MULTI_LANG
|
|
|
290abfa |
(char_u *)&p_hlg, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1409,1415 ****
|
|
|
290abfa |
{"hidden", "hid", P_BOOL|P_VI_DEF,
|
|
|
290abfa |
(char_u *)&p_hid, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"highlight", "hl", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_hl, PV_NONE,
|
|
|
290abfa |
{(char_u *)HIGHLIGHT_INIT, (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
--- 1418,1424 ----
|
|
|
290abfa |
{"hidden", "hid", P_BOOL|P_VI_DEF,
|
|
|
290abfa |
(char_u *)&p_hid, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"highlight", "hl", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_hl, PV_NONE,
|
|
|
290abfa |
{(char_u *)HIGHLIGHT_INIT, (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1540,1546 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
|
|
|
290abfa |
(char_u *)&p_indk, PV_INDK,
|
|
|
290abfa |
{(char_u *)"0{,0},:,0#,!^F,o,O,e", (char_u *)0L}
|
|
|
290abfa |
--- 1549,1555 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
|
|
|
290abfa |
(char_u *)&p_indk, PV_INDK,
|
|
|
290abfa |
{(char_u *)"0{,0},:,0#,!^F,o,O,e", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1651,1657 ****
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"keymodel", "km", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_km, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
|
|
|
290abfa |
--- 1660,1666 ----
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"keymodel", "km", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_km, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1675,1681 ****
|
|
|
290abfa |
#endif
|
|
|
290abfa |
#endif
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"langmap", "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
|
|
|
290abfa |
#ifdef FEAT_LANGMAP
|
|
|
290abfa |
(char_u *)&p_langmap, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", /* unmatched } */
|
|
|
290abfa |
--- 1684,1690 ----
|
|
|
290abfa |
#endif
|
|
|
290abfa |
#endif
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"langmap", "lmap", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_SECURE,
|
|
|
290abfa |
#ifdef FEAT_LANGMAP
|
|
|
290abfa |
(char_u *)&p_langmap, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", /* unmatched } */
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1743,1749 ****
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"lispwords", "lw", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_LISP
|
|
|
290abfa |
(char_u *)&p_lispwords, PV_LW,
|
|
|
290abfa |
{(char_u *)LISPWORD_VALUE, (char_u *)0L}
|
|
|
290abfa |
--- 1752,1758 ----
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"lispwords", "lw", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_LISP
|
|
|
290abfa |
(char_u *)&p_lispwords, PV_LW,
|
|
|
290abfa |
{(char_u *)LISPWORD_VALUE, (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1755,1761 ****
|
|
|
290abfa |
{"list", NULL, P_BOOL|P_VI_DEF|P_RWIN,
|
|
|
290abfa |
(char_u *)VAR_WIN, PV_LIST,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"listchars", "lcs", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_lcs, PV_NONE,
|
|
|
290abfa |
{(char_u *)"eol:$", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"loadplugins", "lpl", P_BOOL|P_VI_DEF,
|
|
|
290abfa |
--- 1764,1770 ----
|
|
|
290abfa |
{"list", NULL, P_BOOL|P_VI_DEF|P_RWIN,
|
|
|
290abfa |
(char_u *)VAR_WIN, PV_LIST,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"listchars", "lcs", P_STRING|P_VI_DEF|P_RALL|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_lcs, PV_NONE,
|
|
|
290abfa |
{(char_u *)"eol:$", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"loadplugins", "lpl", P_BOOL|P_VI_DEF,
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1791,1797 ****
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"matchpairs", "mps", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_mps, PV_MPS,
|
|
|
290abfa |
{(char_u *)"(:),{:},[:]", (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
--- 1800,1806 ----
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"matchpairs", "mps", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_mps, PV_MPS,
|
|
|
290abfa |
{(char_u *)"(:),{:},[:]", (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1896,1902 ****
|
|
|
290abfa |
# endif
|
|
|
290abfa |
#endif
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"mouseshape", "mouses", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_MOUSESHAPE
|
|
|
290abfa |
(char_u *)&p_mouseshape, PV_NONE,
|
|
|
290abfa |
{(char_u *)"i-r:beam,s:updown,sd:udsizing,vs:leftright,vd:lrsizing,m:no,ml:up-arrow,v:rightup-arrow", (char_u *)0L}
|
|
|
290abfa |
--- 1905,1911 ----
|
|
|
290abfa |
# endif
|
|
|
290abfa |
#endif
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"mouseshape", "mouses", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_MOUSESHAPE
|
|
|
290abfa |
(char_u *)&p_mouseshape, PV_NONE,
|
|
|
290abfa |
{(char_u *)"i-r:beam,s:updown,sd:udsizing,vs:leftright,vd:lrsizing,m:no,ml:up-arrow,v:rightup-arrow", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 1918,1924 ****
|
|
|
290abfa |
{"novice", NULL, P_BOOL|P_VI_DEF,
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"nrformats", "nf", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_nf, PV_NF,
|
|
|
290abfa |
{(char_u *)"octal,hex", (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
--- 1927,1933 ----
|
|
|
290abfa |
{"novice", NULL, P_BOOL|P_VI_DEF,
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"nrformats", "nf", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_nf, PV_NF,
|
|
|
290abfa |
{(char_u *)"octal,hex", (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2082,2088 ****
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"printoptions", "popt", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_PRINTER
|
|
|
290abfa |
(char_u *)&p_popt, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
--- 2091,2097 ----
|
|
|
290abfa |
{(char_u *)NULL, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"printoptions", "popt", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_PRINTER
|
|
|
290abfa |
(char_u *)&p_popt, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2132,2138 ****
|
|
|
290abfa |
{"remap", NULL, P_BOOL|P_VI_DEF,
|
|
|
290abfa |
(char_u *)&p_remap, PV_NONE,
|
|
|
290abfa |
{(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"renderoptions", "rop", P_STRING|P_COMMA|P_RCLR|P_VI_DEF,
|
|
|
290abfa |
#ifdef FEAT_RENDER_OPTIONS
|
|
|
290abfa |
(char_u *)&p_rop, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
--- 2141,2147 ----
|
|
|
290abfa |
{"remap", NULL, P_BOOL|P_VI_DEF,
|
|
|
290abfa |
(char_u *)&p_remap, PV_NONE,
|
|
|
290abfa |
{(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"renderoptions", "rop", P_STRING|P_ONECOMMA|P_RCLR|P_VI_DEF,
|
|
|
290abfa |
#ifdef FEAT_RENDER_OPTIONS
|
|
|
290abfa |
(char_u *)&p_rop, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2188,2194 ****
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"runtimepath", "rtp", P_STRING|P_VI_DEF|P_EXPAND|P_COMMA|P_NODUP|P_SECURE,
|
|
|
290abfa |
(char_u *)&p_rtp, PV_NONE,
|
|
|
290abfa |
{(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
--- 2197,2204 ----
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"runtimepath", "rtp", P_STRING|P_VI_DEF|P_EXPAND|P_ONECOMMA|P_NODUP
|
|
|
290abfa |
! |P_SECURE,
|
|
|
290abfa |
(char_u *)&p_rtp, PV_NONE,
|
|
|
290abfa |
{(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2208,2214 ****
|
|
|
290abfa |
{"scrolloff", "so", P_NUM|P_VI_DEF|P_VIM|P_RALL,
|
|
|
290abfa |
(char_u *)&p_so, PV_NONE,
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"scrollopt", "sbo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_SCROLLBIND
|
|
|
290abfa |
(char_u *)&p_sbo, PV_NONE,
|
|
|
290abfa |
{(char_u *)"ver,jump", (char_u *)0L}
|
|
|
290abfa |
--- 2218,2224 ----
|
|
|
290abfa |
{"scrolloff", "so", P_NUM|P_VI_DEF|P_VIM|P_RALL,
|
|
|
290abfa |
(char_u *)&p_so, PV_NONE,
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"scrollopt", "sbo", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_SCROLLBIND
|
|
|
290abfa |
(char_u *)&p_sbo, PV_NONE,
|
|
|
290abfa |
{(char_u *)"ver,jump", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2228,2237 ****
|
|
|
290abfa |
(char_u *)&p_sel, PV_NONE,
|
|
|
290abfa |
{(char_u *)"inclusive", (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"selectmode", "slm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_slm, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_SESSION
|
|
|
290abfa |
(char_u *)&p_ssop, PV_NONE,
|
|
|
290abfa |
{(char_u *)"blank,buffers,curdir,folds,help,options,tabpages,winsize",
|
|
|
290abfa |
--- 2238,2247 ----
|
|
|
290abfa |
(char_u *)&p_sel, PV_NONE,
|
|
|
290abfa |
{(char_u *)"inclusive", (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"selectmode", "slm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_slm, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_SESSION
|
|
|
290abfa |
(char_u *)&p_ssop, PV_NONE,
|
|
|
290abfa |
{(char_u *)"blank,buffers,curdir,folds,help,options,tabpages,winsize",
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2440,2446 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"spellfile", "spf", P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE|P_COMMA,
|
|
|
290abfa |
#ifdef FEAT_SPELL
|
|
|
290abfa |
(char_u *)&p_spf, PV_SPF,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
--- 2450,2457 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"spellfile", "spf", P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE
|
|
|
290abfa |
! |P_ONECOMMA,
|
|
|
290abfa |
#ifdef FEAT_SPELL
|
|
|
290abfa |
(char_u *)&p_spf, PV_SPF,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2449,2455 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"spelllang", "spl", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_RBUF|P_EXPAND,
|
|
|
290abfa |
#ifdef FEAT_SPELL
|
|
|
290abfa |
(char_u *)&p_spl, PV_SPL,
|
|
|
290abfa |
{(char_u *)"en", (char_u *)0L}
|
|
|
290abfa |
--- 2460,2467 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"spelllang", "spl", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA
|
|
|
290abfa |
! |P_RBUF|P_EXPAND,
|
|
|
290abfa |
#ifdef FEAT_SPELL
|
|
|
290abfa |
(char_u *)&p_spl, PV_SPL,
|
|
|
290abfa |
{(char_u *)"en", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2458,2464 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_COMMA,
|
|
|
290abfa |
#ifdef FEAT_SPELL
|
|
|
290abfa |
(char_u *)&p_sps, PV_NONE,
|
|
|
290abfa |
{(char_u *)"best", (char_u *)0L}
|
|
|
290abfa |
--- 2470,2476 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_ONECOMMA,
|
|
|
290abfa |
#ifdef FEAT_SPELL
|
|
|
290abfa |
(char_u *)&p_sps, PV_NONE,
|
|
|
290abfa |
{(char_u *)"best", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2491,2501 ****
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"suffixes", "su", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_su, PV_NONE,
|
|
|
290abfa |
{(char_u *)".bak,~,.o,.h,.info,.swp,.obj",
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"suffixesadd", "sua", P_STRING|P_VI_DEF|P_ALLOCED|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_SEARCHPATH
|
|
|
290abfa |
(char_u *)&p_sua, PV_SUA,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
--- 2503,2513 ----
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"suffixes", "su", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_su, PV_NONE,
|
|
|
290abfa |
{(char_u *)".bak,~,.o,.h,.info,.swp,.obj",
|
|
|
290abfa |
(char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"suffixesadd", "sua", P_STRING|P_VI_DEF|P_ALLOCED|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_SEARCHPATH
|
|
|
290abfa |
(char_u *)&p_sua, PV_SUA,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2510,2516 ****
|
|
|
290abfa |
{"swapsync", "sws", P_STRING|P_VI_DEF,
|
|
|
290abfa |
(char_u *)&p_sws, PV_NONE,
|
|
|
290abfa |
{(char_u *)"fsync", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"switchbuf", "swb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_swb, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"synmaxcol", "smc", P_NUM|P_VI_DEF|P_RBUF,
|
|
|
290abfa |
--- 2522,2528 ----
|
|
|
290abfa |
{"swapsync", "sws", P_STRING|P_VI_DEF,
|
|
|
290abfa |
(char_u *)&p_sws, PV_NONE,
|
|
|
290abfa |
{(char_u *)"fsync", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"switchbuf", "swb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_swb, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"synmaxcol", "smc", P_NUM|P_VI_DEF|P_RBUF,
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2562,2568 ****
|
|
|
290abfa |
{"tagrelative", "tr", P_BOOL|P_VIM,
|
|
|
290abfa |
(char_u *)&p_tr, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
|
|
|
290abfa |
! {"tags", "tag", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_tags, PV_TAGS,
|
|
|
290abfa |
{
|
|
|
290abfa |
#if defined(FEAT_EMACS_TAGS) && !defined(CASE_INSENSITIVE_FILENAME)
|
|
|
290abfa |
--- 2574,2580 ----
|
|
|
290abfa |
{"tagrelative", "tr", P_BOOL|P_VIM,
|
|
|
290abfa |
(char_u *)&p_tr, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
|
|
|
290abfa |
! {"tags", "tag", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_tags, PV_TAGS,
|
|
|
290abfa |
{
|
|
|
290abfa |
#if defined(FEAT_EMACS_TAGS) && !defined(CASE_INSENSITIVE_FILENAME)
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2612,2618 ****
|
|
|
290abfa |
{"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM|P_RBUF,
|
|
|
290abfa |
(char_u *)&p_tw, PV_TW,
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_INS_EXPAND
|
|
|
290abfa |
(char_u *)&p_tsr, PV_TSR,
|
|
|
290abfa |
#else
|
|
|
290abfa |
--- 2624,2630 ----
|
|
|
290abfa |
{"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM|P_RBUF,
|
|
|
290abfa |
(char_u *)&p_tw, PV_TW,
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_INS_EXPAND
|
|
|
290abfa |
(char_u *)&p_tsr, PV_TSR,
|
|
|
290abfa |
#else
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2660,2666 ****
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
|
|
|
290abfa |
! {"toolbar", "tb", P_STRING|P_COMMA|P_VI_DEF|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_toolbar, PV_NONE,
|
|
|
290abfa |
{(char_u *)"icons,tooltips", (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
--- 2672,2678 ----
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
#if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
|
|
|
290abfa |
! {"toolbar", "tb", P_STRING|P_ONECOMMA|P_VI_DEF|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_toolbar, PV_NONE,
|
|
|
290abfa |
{(char_u *)"icons,tooltips", (char_u *)0L}
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2695,2701 ****
|
|
|
290abfa |
{"ttytype", "tty", P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
|
|
|
290abfa |
(char_u *)&T_NAME, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"undodir", "udir", P_STRING|P_EXPAND|P_COMMA|P_NODUP|P_SECURE|P_VI_DEF,
|
|
|
290abfa |
#ifdef FEAT_PERSISTENT_UNDO
|
|
|
290abfa |
(char_u *)&p_udir, PV_NONE,
|
|
|
290abfa |
{(char_u *)".", (char_u *)0L}
|
|
|
290abfa |
--- 2707,2714 ----
|
|
|
290abfa |
{"ttytype", "tty", P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
|
|
|
290abfa |
(char_u *)&T_NAME, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"undodir", "udir", P_STRING|P_EXPAND|P_ONECOMMA|P_NODUP|P_SECURE
|
|
|
290abfa |
! |P_VI_DEF,
|
|
|
290abfa |
#ifdef FEAT_PERSISTENT_UNDO
|
|
|
290abfa |
(char_u *)&p_udir, PV_NONE,
|
|
|
290abfa |
{(char_u *)".", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2744,2750 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"viewoptions", "vop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_SESSION
|
|
|
290abfa |
(char_u *)&p_vop, PV_NONE,
|
|
|
290abfa |
{(char_u *)"folds,options,cursor", (char_u *)0L}
|
|
|
290abfa |
--- 2757,2763 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"viewoptions", "vop", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_SESSION
|
|
|
290abfa |
(char_u *)&p_vop, PV_NONE,
|
|
|
290abfa |
{(char_u *)"folds,options,cursor", (char_u *)0L}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2753,2759 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"viminfo", "vi", P_STRING|P_COMMA|P_NODUP|P_SECURE,
|
|
|
290abfa |
#ifdef FEAT_VIMINFO
|
|
|
290abfa |
(char_u *)&p_viminfo, PV_NONE,
|
|
|
290abfa |
#if defined(MSDOS) || defined(MSWIN) || defined(OS2)
|
|
|
290abfa |
--- 2766,2772 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"viminfo", "vi", P_STRING|P_ONECOMMA|P_NODUP|P_SECURE,
|
|
|
290abfa |
#ifdef FEAT_VIMINFO
|
|
|
290abfa |
(char_u *)&p_viminfo, PV_NONE,
|
|
|
290abfa |
#if defined(MSDOS) || defined(MSWIN) || defined(OS2)
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2771,2777 ****
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"virtualedit", "ve", P_STRING|P_COMMA|P_NODUP|P_VI_DEF|P_VIM|P_CURSWANT,
|
|
|
290abfa |
#ifdef FEAT_VIRTUALEDIT
|
|
|
290abfa |
(char_u *)&p_ve, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)""}
|
|
|
290abfa |
--- 2784,2791 ----
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L}
|
|
|
290abfa |
#endif
|
|
|
290abfa |
SCRIPTID_INIT},
|
|
|
290abfa |
! {"virtualedit", "ve", P_STRING|P_ONECOMMA|P_NODUP|P_VI_DEF
|
|
|
290abfa |
! |P_VIM|P_CURSWANT,
|
|
|
290abfa |
#ifdef FEAT_VIRTUALEDIT
|
|
|
290abfa |
(char_u *)&p_ve, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)""}
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2798,2804 ****
|
|
|
290abfa |
{"weirdinvert", "wiv", P_BOOL|P_VI_DEF|P_RCLR,
|
|
|
290abfa |
(char_u *)&p_wiv, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"whichwrap", "ww", P_STRING|P_VIM|P_COMMA|P_FLAGLIST,
|
|
|
290abfa |
(char_u *)&p_ww, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)"b,s"} SCRIPTID_INIT},
|
|
|
290abfa |
{"wildchar", "wc", P_NUM|P_VIM,
|
|
|
290abfa |
--- 2812,2818 ----
|
|
|
290abfa |
{"weirdinvert", "wiv", P_BOOL|P_VI_DEF|P_RCLR,
|
|
|
290abfa |
(char_u *)&p_wiv, PV_NONE,
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"whichwrap", "ww", P_STRING|P_VIM|P_ONECOMMA|P_FLAGLIST,
|
|
|
290abfa |
(char_u *)&p_ww, PV_NONE,
|
|
|
290abfa |
{(char_u *)"", (char_u *)"b,s"} SCRIPTID_INIT},
|
|
|
290abfa |
{"wildchar", "wc", P_NUM|P_VIM,
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2808,2814 ****
|
|
|
290abfa |
{"wildcharm", "wcm", P_NUM|P_VI_DEF,
|
|
|
290abfa |
(char_u *)&p_wcm, PV_NONE,
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"wildignore", "wig", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_WILDIGN
|
|
|
290abfa |
(char_u *)&p_wig, PV_NONE,
|
|
|
290abfa |
#else
|
|
|
290abfa |
--- 2822,2828 ----
|
|
|
290abfa |
{"wildcharm", "wcm", P_NUM|P_VI_DEF,
|
|
|
290abfa |
(char_u *)&p_wcm, PV_NONE,
|
|
|
290abfa |
{(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"wildignore", "wig", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
#ifdef FEAT_WILDIGN
|
|
|
290abfa |
(char_u *)&p_wig, PV_NONE,
|
|
|
290abfa |
#else
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 2825,2831 ****
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"wildmode", "wim", P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_wim, PV_NONE,
|
|
|
290abfa |
{(char_u *)"full", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"wildoptions", "wop", P_STRING|P_VI_DEF,
|
|
|
290abfa |
--- 2839,2845 ----
|
|
|
290abfa |
(char_u *)NULL, PV_NONE,
|
|
|
290abfa |
#endif
|
|
|
290abfa |
{(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
! {"wildmode", "wim", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
|
|
|
290abfa |
(char_u *)&p_wim, PV_NONE,
|
|
|
290abfa |
{(char_u *)"full", (char_u *)0L} SCRIPTID_INIT},
|
|
|
290abfa |
{"wildoptions", "wop", P_STRING|P_VI_DEF,
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 4830,4836 ****
|
|
|
290abfa |
{
|
|
|
290abfa |
i = (int)STRLEN(origval);
|
|
|
290abfa |
/* strip a trailing comma, would get 2 */
|
|
|
290abfa |
! if (comma && i > 1 && origval[i - 1] == ','
|
|
|
290abfa |
&& origval[i - 2] != '\\')
|
|
|
290abfa |
i--;
|
|
|
290abfa |
mch_memmove(newval + i + comma, newval,
|
|
|
290abfa |
--- 4844,4851 ----
|
|
|
290abfa |
{
|
|
|
290abfa |
i = (int)STRLEN(origval);
|
|
|
290abfa |
/* strip a trailing comma, would get 2 */
|
|
|
290abfa |
! if (comma && (flags & P_ONECOMMA) && i > 1
|
|
|
290abfa |
! && origval[i - 1] == ','
|
|
|
290abfa |
&& origval[i - 2] != '\\')
|
|
|
290abfa |
i--;
|
|
|
290abfa |
mch_memmove(newval + i + comma, newval,
|
|
|
290abfa |
*** ../vim-7.4.748/src/version.c 2015-06-19 21:06:04.664521324 +0200
|
|
|
290abfa |
--- src/version.c 2015-06-20 15:01:31.732536696 +0200
|
|
|
290abfa |
***************
|
|
|
290abfa |
*** 743,744 ****
|
|
|
290abfa |
--- 743,746 ----
|
|
|
290abfa |
{ /* Add new patch number below this line */
|
|
|
290abfa |
+ /**/
|
|
|
290abfa |
+ 749,
|
|
|
290abfa |
/**/
|
|
|
290abfa |
|
|
|
290abfa |
--
|
|
|
290abfa |
"Microsoft is like Coke. It's a secret formula, all the money is from
|
|
|
290abfa |
distribution, and their goal is to get Coke everywhere. Open source is like
|
|
|
290abfa |
selling water. There are water companies like Perrier and Poland Spring, but
|
|
|
290abfa |
you're competing with something that's free." -- Carl Howe
|
|
|
290abfa |
|
|
|
290abfa |
|
|
|
290abfa |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
290abfa |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
290abfa |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
290abfa |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|