Mercurial > vim

comparison src/option.c @ 6858:e73d5ac8b16b v7.4.749

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 7.4.749 Problem: For some options two consecutive commas are OK. (Nikolay Pavlov) Solution: Add the P_ONECOMMA flag.
author Bram Moolenaar <bram@vim.org>
date Sat, 20 Jun 2015 15:30:03 +0200
parents 0f1cc87630d8
children 7bd926109eea
comparison
equal deleted inserted replaced
6857:2957a57decad 6858:e73d5ac8b16b
437 #define P_RWIN 0x2000 /* redraw current window */ 437 #define P_RWIN 0x2000 /* redraw current window */
438 #define P_RBUF 0x4000 /* redraw current buffer */ 438 #define P_RBUF 0x4000 /* redraw current buffer */
439 #define P_RALL 0x6000 /* redraw all windows */ 439 #define P_RALL 0x6000 /* redraw all windows */
440 #define P_RCLR 0x7000 /* clear and redraw all */ 440 #define P_RCLR 0x7000 /* clear and redraw all */
441 441
442 #define P_COMMA 0x8000 /* comma separated list */ 442 #define P_COMMA 0x8000 /* comma separated list */
443 #define P_NODUP 0x10000L /* don't allow duplicate strings */ 443 #define P_ONECOMMA 0x18000L /* P_COMMA and cannot have two consecutive
444 #define P_FLAGLIST 0x20000L /* list of single-char flags */ 444 * commas */
445 445 #define P_NODUP 0x20000L /* don't allow duplicate strings */
446 #define P_SECURE 0x40000L /* cannot change in modeline or secure mode */ 446 #define P_FLAGLIST 0x40000L /* list of single-char flags */
447 #define P_GETTEXT 0x80000L /* expand default value with _() */ 447
448 #define P_NOGLOB 0x100000L /* do not use local value for global vimrc */ 448 #define P_SECURE 0x80000L /* cannot change in modeline or secure mode */
449 #define P_NFNAME 0x200000L /* only normal file name chars allowed */ 449 #define P_GETTEXT 0x100000L /* expand default value with _() */
450 #define P_INSECURE 0x400000L /* option was set from a modeline */ 450 #define P_NOGLOB 0x200000L /* do not use local value for global vimrc */
451 #define P_PRI_MKRC 0x800000L /* priority for :mkvimrc (setting option has 451 #define P_NFNAME 0x400000L /* only normal file name chars allowed */
452 #define P_INSECURE 0x800000L /* option was set from a modeline */
453 #define P_PRI_MKRC 0x1000000L /* priority for :mkvimrc (setting option has
452 side effects) */ 454 side effects) */
453 #define P_NO_ML 0x1000000L /* not allowed in modeline */ 455 #define P_NO_ML 0x2000000L /* not allowed in modeline */
454 #define P_CURSWANT 0x2000000L /* update curswant required; not needed when 456 #define P_CURSWANT 0x4000000L /* update curswant required; not needed when
455 * there is a redraw flag */ 457 * there is a redraw flag */
456 458
457 #define ISK_LATIN1 (char_u *)"@,48-57,_,192-255" 459 #define ISK_LATIN1 (char_u *)"@,48-57,_,192-255"
458 460
459 /* 'isprint' for latin1 is also used for MS-Windows cp1252, where 0x80 is used 461 /* 'isprint' for latin1 is also used for MS-Windows cp1252, where 0x80 is used
574 (char_u *)"dark", 576 (char_u *)"dark",
575 #else 577 #else
576 (char_u *)"light", 578 (char_u *)"light",
577 #endif 579 #endif
578 (char_u *)0L} SCRIPTID_INIT}, 580 (char_u *)0L} SCRIPTID_INIT},
579 {"backspace", "bs", P_STRING|P_VI_DEF|P_VIM|P_COMMA|P_NODUP, 581 {"backspace", "bs", P_STRING|P_VI_DEF|P_VIM|P_ONECOMMA|P_NODUP,
580 (char_u *)&p_bs, PV_NONE, 582 (char_u *)&p_bs, PV_NONE,
581 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 583 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
582 {"backup", "bk", P_BOOL|P_VI_DEF|P_VIM, 584 {"backup", "bk", P_BOOL|P_VI_DEF|P_VIM,
583 (char_u *)&p_bk, PV_NONE, 585 (char_u *)&p_bk, PV_NONE,
584 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 586 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
585 {"backupcopy", "bkc", P_STRING|P_VIM|P_COMMA|P_NODUP, 587 {"backupcopy", "bkc", P_STRING|P_VIM|P_ONECOMMA|P_NODUP,
586 (char_u *)&p_bkc, PV_BKC, 588 (char_u *)&p_bkc, PV_BKC,
587 #ifdef UNIX 589 #ifdef UNIX
588 {(char_u *)"yes", (char_u *)"auto"} 590 {(char_u *)"yes", (char_u *)"auto"}
589 #else 591 #else
590 {(char_u *)"auto", (char_u *)"auto"} 592 {(char_u *)"auto", (char_u *)"auto"}
591 #endif 593 #endif
592 SCRIPTID_INIT}, 594 SCRIPTID_INIT},
593 {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, 595 {"backupdir", "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA
596 |P_NODUP|P_SECURE,
594 (char_u *)&p_bdir, PV_NONE, 597 (char_u *)&p_bdir, PV_NONE,
595 {(char_u *)DFLT_BDIR, (char_u *)0L} SCRIPTID_INIT}, 598 {(char_u *)DFLT_BDIR, (char_u *)0L} SCRIPTID_INIT},
596 {"backupext", "bex", P_STRING|P_VI_DEF|P_NFNAME, 599 {"backupext", "bex", P_STRING|P_VI_DEF|P_NFNAME,
597 (char_u *)&p_bex, PV_NONE, 600 (char_u *)&p_bex, PV_NONE,
598 { 601 {
600 (char_u *)"_", 603 (char_u *)"_",
601 #else 604 #else
602 (char_u *)"~", 605 (char_u *)"~",
603 #endif 606 #endif
604 (char_u *)0L} SCRIPTID_INIT}, 607 (char_u *)0L} SCRIPTID_INIT},
605 {"backupskip", "bsk", P_STRING|P_VI_DEF|P_COMMA, 608 {"backupskip", "bsk", P_STRING|P_VI_DEF|P_ONECOMMA,
606 #ifdef FEAT_WILDIGN 609 #ifdef FEAT_WILDIGN
607 (char_u *)&p_bsk, PV_NONE, 610 (char_u *)&p_bsk, PV_NONE,
608 {(char_u *)"", (char_u *)0L} 611 {(char_u *)"", (char_u *)0L}
609 #else 612 #else
610 (char_u *)NULL, PV_NONE, 613 (char_u *)NULL, PV_NONE,
660 #else 663 #else
661 (char_u *)NULL, PV_NONE, 664 (char_u *)NULL, PV_NONE,
662 {(char_u *)0L, (char_u *)0L} 665 {(char_u *)0L, (char_u *)0L}
663 #endif 666 #endif
664 SCRIPTID_INIT}, 667 SCRIPTID_INIT},
665 {"breakindentopt", "briopt", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_COMMA|P_NODUP, 668 {"breakindentopt", "briopt", P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF
669 |P_ONECOMMA|P_NODUP,
666 #ifdef FEAT_LINEBREAK 670 #ifdef FEAT_LINEBREAK
667 (char_u *)VAR_WIN, PV_BRIOPT, 671 (char_u *)VAR_WIN, PV_BRIOPT,
668 {(char_u *)"", (char_u *)NULL} 672 {(char_u *)"", (char_u *)NULL}
669 #else 673 #else
670 (char_u *)NULL, PV_NONE, 674 (char_u *)NULL, PV_NONE,
700 #else 704 #else
701 (char_u *)NULL, PV_NONE, 705 (char_u *)NULL, PV_NONE,
702 {(char_u *)0L, (char_u *)0L} 706 {(char_u *)0L, (char_u *)0L}
703 #endif 707 #endif
704 SCRIPTID_INIT}, 708 SCRIPTID_INIT},
705 {"casemap", "cmp", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 709 {"casemap", "cmp", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
706 #ifdef FEAT_MBYTE 710 #ifdef FEAT_MBYTE
707 (char_u *)&p_cmp, PV_NONE, 711 (char_u *)&p_cmp, PV_NONE,
708 {(char_u *)"internal,keepascii", (char_u *)0L} 712 {(char_u *)"internal,keepascii", (char_u *)0L}
709 #else 713 #else
710 (char_u *)NULL, PV_NONE, 714 (char_u *)NULL, PV_NONE,
743 (char_u *)&p_cin, PV_CIN, 747 (char_u *)&p_cin, PV_CIN,
744 #else 748 #else
745 (char_u *)NULL, PV_NONE, 749 (char_u *)NULL, PV_NONE,
746 #endif 750 #endif
747 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 751 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
748 {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, 752 {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
749 #ifdef FEAT_CINDENT 753 #ifdef FEAT_CINDENT
750 (char_u *)&p_cink, PV_CINK, 754 (char_u *)&p_cink, PV_CINK,
751 {(char_u *)"0{,0},0),:,0#,!^F,o,O,e", (char_u *)0L} 755 {(char_u *)"0{,0},0),:,0#,!^F,o,O,e", (char_u *)0L}
752 #else 756 #else
753 (char_u *)NULL, PV_NONE, 757 (char_u *)NULL, PV_NONE,
754 {(char_u *)0L, (char_u *)0L} 758 {(char_u *)0L, (char_u *)0L}
755 #endif 759 #endif
756 SCRIPTID_INIT}, 760 SCRIPTID_INIT},
757 {"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, 761 {"cinoptions", "cino", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
758 #ifdef FEAT_CINDENT 762 #ifdef FEAT_CINDENT
759 (char_u *)&p_cino, PV_CINO, 763 (char_u *)&p_cino, PV_CINO,
760 #else 764 #else
761 (char_u *)NULL, PV_NONE, 765 (char_u *)NULL, PV_NONE,
762 #endif 766 #endif
763 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 767 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
764 {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, 768 {"cinwords", "cinw", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
765 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT) 769 #if defined(FEAT_SMARTINDENT) || defined(FEAT_CINDENT)
766 (char_u *)&p_cinw, PV_CINW, 770 (char_u *)&p_cinw, PV_CINW,
767 {(char_u *)"if,else,while,do,for,switch", 771 {(char_u *)"if,else,while,do,for,switch",
768 (char_u *)0L} 772 (char_u *)0L}
769 #else 773 #else
770 (char_u *)NULL, PV_NONE, 774 (char_u *)NULL, PV_NONE,
771 {(char_u *)0L, (char_u *)0L} 775 {(char_u *)0L, (char_u *)0L}
772 #endif 776 #endif
773 SCRIPTID_INIT}, 777 SCRIPTID_INIT},
774 {"clipboard", "cb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 778 {"clipboard", "cb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
775 #ifdef FEAT_CLIPBOARD 779 #ifdef FEAT_CLIPBOARD
776 (char_u *)&p_cb, PV_NONE, 780 (char_u *)&p_cb, PV_NONE,
777 # ifdef FEAT_XCLIPBOARD 781 # ifdef FEAT_XCLIPBOARD
778 {(char_u *)"autoselect,exclude:cons\\|linux", 782 {(char_u *)"autoselect,exclude:cons\\|linux",
779 (char_u *)0L} 783 (char_u *)0L}
793 (char_u *)&p_cwh, PV_NONE, 797 (char_u *)&p_cwh, PV_NONE,
794 #else 798 #else
795 (char_u *)NULL, PV_NONE, 799 (char_u *)NULL, PV_NONE,
796 #endif 800 #endif
797 {(char_u *)7L, (char_u *)0L} SCRIPTID_INIT}, 801 {(char_u *)7L, (char_u *)0L} SCRIPTID_INIT},
798 {"colorcolumn", "cc", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_RWIN, 802 {"colorcolumn", "cc", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN,
799 #ifdef FEAT_SYN_HL 803 #ifdef FEAT_SYN_HL
800 (char_u *)VAR_WIN, PV_CC, 804 (char_u *)VAR_WIN, PV_CC,
801 #else 805 #else
802 (char_u *)NULL, PV_NONE, 806 (char_u *)NULL, PV_NONE,
803 #endif 807 #endif
804 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 808 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
805 {"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR, 809 {"columns", "co", P_NUM|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RCLR,
806 (char_u *)&Columns, PV_NONE, 810 (char_u *)&Columns, PV_NONE,
807 {(char_u *)80L, (char_u *)0L} SCRIPTID_INIT}, 811 {(char_u *)80L, (char_u *)0L} SCRIPTID_INIT},
808 {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP|P_CURSWANT, 812 {"comments", "com", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA
813 |P_NODUP|P_CURSWANT,
809 #ifdef FEAT_COMMENTS 814 #ifdef FEAT_COMMENTS
810 (char_u *)&p_com, PV_COM, 815 (char_u *)&p_com, PV_COM,
811 {(char_u *)"s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-", 816 {(char_u *)"s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:-",
812 (char_u *)0L} 817 (char_u *)0L}
813 #else 818 #else
827 /* P_PRI_MKRC isn't needed here, optval_default() 832 /* P_PRI_MKRC isn't needed here, optval_default()
828 * always returns TRUE for 'compatible' */ 833 * always returns TRUE for 'compatible' */
829 {"compatible", "cp", P_BOOL|P_RALL, 834 {"compatible", "cp", P_BOOL|P_RALL,
830 (char_u *)&p_cp, PV_NONE, 835 (char_u *)&p_cp, PV_NONE,
831 {(char_u *)TRUE, (char_u *)FALSE} SCRIPTID_INIT}, 836 {(char_u *)TRUE, (char_u *)FALSE} SCRIPTID_INIT},
832 {"complete", "cpt", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, 837 {"complete", "cpt", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
833 #ifdef FEAT_INS_EXPAND 838 #ifdef FEAT_INS_EXPAND
834 (char_u *)&p_cpt, PV_CPT, 839 (char_u *)&p_cpt, PV_CPT,
835 {(char_u *)".,w,b,u,t,i", (char_u *)0L} 840 {(char_u *)".,w,b,u,t,i", (char_u *)0L}
836 #else 841 #else
837 (char_u *)NULL, PV_NONE, 842 (char_u *)NULL, PV_NONE,
862 #else 867 #else
863 (char_u *)NULL, PV_NONE, 868 (char_u *)NULL, PV_NONE,
864 {(char_u *)0L, (char_u *)0L} 869 {(char_u *)0L, (char_u *)0L}
865 #endif 870 #endif
866 SCRIPTID_INIT}, 871 SCRIPTID_INIT},
867 {"completeopt", "cot", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 872 {"completeopt", "cot", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
868 #ifdef FEAT_INS_EXPAND 873 #ifdef FEAT_INS_EXPAND
869 (char_u *)&p_cot, PV_NONE, 874 (char_u *)&p_cot, PV_NONE,
870 {(char_u *)"menu,preview", (char_u *)0L} 875 {(char_u *)"menu,preview", (char_u *)0L}
871 #else 876 #else
872 (char_u *)NULL, PV_NONE, 877 (char_u *)NULL, PV_NONE,
917 #else 922 #else
918 (char_u *)NULL, PV_NONE, 923 (char_u *)NULL, PV_NONE,
919 {(char_u *)0L, (char_u *)0L} 924 {(char_u *)0L, (char_u *)0L}
920 #endif 925 #endif
921 SCRIPTID_INIT}, 926 SCRIPTID_INIT},
922 {"cscopequickfix", "csqf", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 927 {"cscopequickfix", "csqf", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
923 #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX) 928 #if defined(FEAT_CSCOPE) && defined(FEAT_QUICKFIX)
924 (char_u *)&p_csqf, PV_NONE, 929 (char_u *)&p_csqf, PV_NONE,
925 {(char_u *)"", (char_u *)0L} 930 {(char_u *)"", (char_u *)0L}
926 #else 931 #else
927 (char_u *)NULL, PV_NONE, 932 (char_u *)NULL, PV_NONE,
994 (char_u *)&p_deco, PV_NONE, 999 (char_u *)&p_deco, PV_NONE,
995 #else 1000 #else
996 (char_u *)NULL, PV_NONE, 1001 (char_u *)NULL, PV_NONE,
997 #endif 1002 #endif
998 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1003 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
999 {"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, 1004 {"dictionary", "dict", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP,
1000 #ifdef FEAT_INS_EXPAND 1005 #ifdef FEAT_INS_EXPAND
1001 (char_u *)&p_dict, PV_DICT, 1006 (char_u *)&p_dict, PV_DICT,
1002 #else 1007 #else
1003 (char_u *)NULL, PV_NONE, 1008 (char_u *)NULL, PV_NONE,
1004 #endif 1009 #endif
1017 #else 1022 #else
1018 (char_u *)NULL, PV_NONE, 1023 (char_u *)NULL, PV_NONE,
1019 {(char_u *)0L, (char_u *)0L} 1024 {(char_u *)0L, (char_u *)0L}
1020 #endif 1025 #endif
1021 SCRIPTID_INIT}, 1026 SCRIPTID_INIT},
1022 {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_COMMA|P_NODUP, 1027 {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_ONECOMMA
1028 |P_NODUP,
1023 #ifdef FEAT_DIFF 1029 #ifdef FEAT_DIFF
1024 (char_u *)&p_dip, PV_NONE, 1030 (char_u *)&p_dip, PV_NONE,
1025 {(char_u *)"filler", (char_u *)NULL} 1031 {(char_u *)"filler", (char_u *)NULL}
1026 #else 1032 #else
1027 (char_u *)NULL, PV_NONE, 1033 (char_u *)NULL, PV_NONE,
1033 (char_u *)&p_dg, PV_NONE, 1039 (char_u *)&p_dg, PV_NONE,
1034 #else 1040 #else
1035 (char_u *)NULL, PV_NONE, 1041 (char_u *)NULL, PV_NONE,
1036 #endif 1042 #endif
1037 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1043 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1038 {"directory", "dir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, 1044 {"directory", "dir", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA
1045 |P_NODUP|P_SECURE,
1039 (char_u *)&p_dir, PV_NONE, 1046 (char_u *)&p_dir, PV_NONE,
1040 {(char_u *)DFLT_DIR, (char_u *)0L} SCRIPTID_INIT}, 1047 {(char_u *)DFLT_DIR, (char_u *)0L} SCRIPTID_INIT},
1041 {"display", "dy", P_STRING|P_VI_DEF|P_COMMA|P_RALL|P_NODUP, 1048 {"display", "dy", P_STRING|P_VI_DEF|P_ONECOMMA|P_RALL|P_NODUP,
1042 (char_u *)&p_dy, PV_NONE, 1049 (char_u *)&p_dy, PV_NONE,
1043 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 1050 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
1044 {"eadirection", "ead", P_STRING|P_VI_DEF, 1051 {"eadirection", "ead", P_STRING|P_VI_DEF,
1045 #ifdef FEAT_VERTSPLIT 1052 #ifdef FEAT_VERTSPLIT
1046 (char_u *)&p_ead, PV_NONE, 1053 (char_u *)&p_ead, PV_NONE,
1081 #else 1088 #else
1082 (char_u *)NULL, PV_NONE, 1089 (char_u *)NULL, PV_NONE,
1083 {(char_u *)NULL, (char_u *)0L} 1090 {(char_u *)NULL, (char_u *)0L}
1084 #endif 1091 #endif
1085 SCRIPTID_INIT}, 1092 SCRIPTID_INIT},
1086 {"errorformat", "efm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 1093 {"errorformat", "efm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
1087 #ifdef FEAT_QUICKFIX 1094 #ifdef FEAT_QUICKFIX
1088 (char_u *)&p_efm, PV_EFM, 1095 (char_u *)&p_efm, PV_EFM,
1089 {(char_u *)DFLT_EFM, (char_u *)0L} 1096 {(char_u *)DFLT_EFM, (char_u *)0L}
1090 #else 1097 #else
1091 (char_u *)NULL, PV_NONE, 1098 (char_u *)NULL, PV_NONE,
1093 #endif 1100 #endif
1094 SCRIPTID_INIT}, 1101 SCRIPTID_INIT},
1095 {"esckeys", "ek", P_BOOL|P_VIM, 1102 {"esckeys", "ek", P_BOOL|P_VIM,
1096 (char_u *)&p_ek, PV_NONE, 1103 (char_u *)&p_ek, PV_NONE,
1097 {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, 1104 {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
1098 {"eventignore", "ei", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 1105 {"eventignore", "ei", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
1099 #ifdef FEAT_AUTOCMD 1106 #ifdef FEAT_AUTOCMD
1100 (char_u *)&p_ei, PV_NONE, 1107 (char_u *)&p_ei, PV_NONE,
1101 #else 1108 #else
1102 (char_u *)NULL, PV_NONE, 1109 (char_u *)NULL, PV_NONE,
1103 #endif 1110 #endif
1106 (char_u *)&p_et, PV_ET, 1113 (char_u *)&p_et, PV_ET,
1107 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1114 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1108 {"exrc", "ex", P_BOOL|P_VI_DEF|P_SECURE, 1115 {"exrc", "ex", P_BOOL|P_VI_DEF|P_SECURE,
1109 (char_u *)&p_exrc, PV_NONE, 1116 (char_u *)&p_exrc, PV_NONE,
1110 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1117 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1111 {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF|P_NO_MKRC, 1118 {"fileencoding","fenc", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_RBUF
1119 |P_NO_MKRC,
1112 #ifdef FEAT_MBYTE 1120 #ifdef FEAT_MBYTE
1113 (char_u *)&p_fenc, PV_FENC, 1121 (char_u *)&p_fenc, PV_FENC,
1114 {(char_u *)"", (char_u *)0L} 1122 {(char_u *)"", (char_u *)0L}
1115 #else 1123 #else
1116 (char_u *)NULL, PV_NONE, 1124 (char_u *)NULL, PV_NONE,
1117 {(char_u *)0L, (char_u *)0L} 1125 {(char_u *)0L, (char_u *)0L}
1118 #endif 1126 #endif
1119 SCRIPTID_INIT}, 1127 SCRIPTID_INIT},
1120 {"fileencodings","fencs", P_STRING|P_VI_DEF|P_COMMA, 1128 {"fileencodings","fencs", P_STRING|P_VI_DEF|P_ONECOMMA,
1121 #ifdef FEAT_MBYTE 1129 #ifdef FEAT_MBYTE
1122 (char_u *)&p_fencs, PV_NONE, 1130 (char_u *)&p_fencs, PV_NONE,
1123 {(char_u *)"ucs-bom", (char_u *)0L} 1131 {(char_u *)"ucs-bom", (char_u *)0L}
1124 #else 1132 #else
1125 (char_u *)NULL, PV_NONE, 1133 (char_u *)NULL, PV_NONE,
1126 {(char_u *)0L, (char_u *)0L} 1134 {(char_u *)0L, (char_u *)0L}
1127 #endif 1135 #endif
1128 SCRIPTID_INIT}, 1136 SCRIPTID_INIT},
1129 {"fileformat", "ff", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC|P_CURSWANT, 1137 {"fileformat", "ff", P_STRING|P_ALLOCED|P_VI_DEF|P_RSTAT|P_NO_MKRC
1138 |P_CURSWANT,
1130 (char_u *)&p_ff, PV_FF, 1139 (char_u *)&p_ff, PV_FF,
1131 {(char_u *)DFLT_FF, (char_u *)0L} SCRIPTID_INIT}, 1140 {(char_u *)DFLT_FF, (char_u *)0L} SCRIPTID_INIT},
1132 {"fileformats", "ffs", P_STRING|P_VIM|P_COMMA|P_NODUP, 1141 {"fileformats", "ffs", P_STRING|P_VIM|P_ONECOMMA|P_NODUP,
1133 (char_u *)&p_ffs, PV_NONE, 1142 (char_u *)&p_ffs, PV_NONE,
1134 {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM} 1143 {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}
1135 SCRIPTID_INIT}, 1144 SCRIPTID_INIT},
1136 {"fileignorecase", "fic", P_BOOL|P_VI_DEF, 1145 {"fileignorecase", "fic", P_BOOL|P_VI_DEF,
1137 (char_u *)&p_fic, PV_NONE, 1146 (char_u *)&p_fic, PV_NONE,
1149 #else 1158 #else
1150 (char_u *)NULL, PV_NONE, 1159 (char_u *)NULL, PV_NONE,
1151 {(char_u *)0L, (char_u *)0L} 1160 {(char_u *)0L, (char_u *)0L}
1152 #endif 1161 #endif
1153 SCRIPTID_INIT}, 1162 SCRIPTID_INIT},
1154 {"fillchars", "fcs", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP, 1163 {"fillchars", "fcs", P_STRING|P_VI_DEF|P_RALL|P_ONECOMMA|P_NODUP,
1155 #if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING) 1164 #if defined(FEAT_WINDOWS) || defined(FEAT_FOLDING)
1156 (char_u *)&p_fcs, PV_NONE, 1165 (char_u *)&p_fcs, PV_NONE,
1157 {(char_u *)"vert:|,fold:-", (char_u *)0L} 1166 {(char_u *)"vert:|,fold:-", (char_u *)0L}
1158 #else 1167 #else
1159 (char_u *)NULL, PV_NONE, 1168 (char_u *)NULL, PV_NONE,
1169 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1178 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1170 {"flash", "fl", P_BOOL|P_VI_DEF, 1179 {"flash", "fl", P_BOOL|P_VI_DEF,
1171 (char_u *)NULL, PV_NONE, 1180 (char_u *)NULL, PV_NONE,
1172 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1181 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1173 #ifdef FEAT_FOLDING 1182 #ifdef FEAT_FOLDING
1174 {"foldclose", "fcl", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_RWIN, 1183 {"foldclose", "fcl", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_RWIN,
1175 (char_u *)&p_fcl, PV_NONE, 1184 (char_u *)&p_fcl, PV_NONE,
1176 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 1185 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
1177 {"foldcolumn", "fdc", P_NUM|P_VI_DEF|P_RWIN, 1186 {"foldcolumn", "fdc", P_NUM|P_VI_DEF|P_RWIN,
1178 (char_u *)VAR_WIN, PV_FDC, 1187 (char_u *)VAR_WIN, PV_FDC,
1179 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1188 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1197 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, 1206 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
1198 {"foldlevelstart","fdls", P_NUM|P_VI_DEF|P_CURSWANT, 1207 {"foldlevelstart","fdls", P_NUM|P_VI_DEF|P_CURSWANT,
1199 (char_u *)&p_fdls, PV_NONE, 1208 (char_u *)&p_fdls, PV_NONE,
1200 {(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT}, 1209 {(char_u *)-1L, (char_u *)0L} SCRIPTID_INIT},
1201 {"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF| 1210 {"foldmarker", "fmr", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|
1202 P_RWIN|P_COMMA|P_NODUP, 1211 P_RWIN|P_ONECOMMA|P_NODUP,
1203 (char_u *)VAR_WIN, PV_FMR, 1212 (char_u *)VAR_WIN, PV_FMR,
1204 {(char_u *)"{{{,}}}", (char_u *)NULL} 1213 {(char_u *)"{{{,}}}", (char_u *)NULL}
1205 SCRIPTID_INIT}, 1214 SCRIPTID_INIT},
1206 {"foldmethod", "fdm", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, 1215 {"foldmethod", "fdm", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
1207 (char_u *)VAR_WIN, PV_FDM, 1216 (char_u *)VAR_WIN, PV_FDM,
1210 (char_u *)VAR_WIN, PV_FML, 1219 (char_u *)VAR_WIN, PV_FML,
1211 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, 1220 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
1212 {"foldnestmax", "fdn", P_NUM|P_VI_DEF|P_RWIN, 1221 {"foldnestmax", "fdn", P_NUM|P_VI_DEF|P_RWIN,
1213 (char_u *)VAR_WIN, PV_FDN, 1222 (char_u *)VAR_WIN, PV_FDN,
1214 {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT}, 1223 {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
1215 {"foldopen", "fdo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_CURSWANT, 1224 {"foldopen", "fdo", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_CURSWANT,
1216 (char_u *)&p_fdo, PV_NONE, 1225 (char_u *)&p_fdo, PV_NONE,
1217 {(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo", 1226 {(char_u *)"block,hor,mark,percent,quickfix,search,tag,undo",
1218 (char_u *)0L} SCRIPTID_INIT}, 1227 (char_u *)0L} SCRIPTID_INIT},
1219 {"foldtext", "fdt", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN, 1228 {"foldtext", "fdt", P_STRING|P_ALLOCED|P_VIM|P_VI_DEF|P_RWIN,
1220 # ifdef FEAT_EVAL 1229 # ifdef FEAT_EVAL
1259 (char_u *)&p_gd, PV_NONE, 1268 (char_u *)&p_gd, PV_NONE,
1260 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1269 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1261 {"graphic", "gr", P_BOOL|P_VI_DEF, 1270 {"graphic", "gr", P_BOOL|P_VI_DEF,
1262 (char_u *)NULL, PV_NONE, 1271 (char_u *)NULL, PV_NONE,
1263 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1272 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1264 {"grepformat", "gfm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 1273 {"grepformat", "gfm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
1265 #ifdef FEAT_QUICKFIX 1274 #ifdef FEAT_QUICKFIX
1266 (char_u *)&p_gefm, PV_NONE, 1275 (char_u *)&p_gefm, PV_NONE,
1267 {(char_u *)DFLT_GREPFORMAT, (char_u *)0L} 1276 {(char_u *)DFLT_GREPFORMAT, (char_u *)0L}
1268 #else 1277 #else
1269 (char_u *)NULL, PV_NONE, 1278 (char_u *)NULL, PV_NONE,
1294 #else 1303 #else
1295 (char_u *)NULL, PV_NONE, 1304 (char_u *)NULL, PV_NONE,
1296 {(char_u *)NULL, (char_u *)0L} 1305 {(char_u *)NULL, (char_u *)0L}
1297 #endif 1306 #endif
1298 SCRIPTID_INIT}, 1307 SCRIPTID_INIT},
1299 {"guicursor", "gcr", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 1308 {"guicursor", "gcr", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
1300 #ifdef CURSOR_SHAPE 1309 #ifdef CURSOR_SHAPE
1301 (char_u *)&p_guicursor, PV_NONE, 1310 (char_u *)&p_guicursor, PV_NONE,
1302 { 1311 {
1303 # ifdef FEAT_GUI 1312 # ifdef FEAT_GUI
1304 (char_u *)"n-v-c:block-Cursor/lCursor,ve:ver35-Cursor,o:hor50-Cursor,i-ci:ver25-Cursor/lCursor,r-cr:hor20-Cursor/lCursor,sm:block-Cursor-blinkwait175-blinkoff150-blinkon175", 1313 (char_u *)"n-v-c:block-Cursor/lCursor,ve:ver35-Cursor,o:hor50-Cursor,i-ci:ver25-Cursor/lCursor,r-cr:hor20-Cursor/lCursor,sm:block-Cursor-blinkwait175-blinkoff150-blinkon175",
1309 #else 1318 #else
1310 (char_u *)NULL, PV_NONE, 1319 (char_u *)NULL, PV_NONE,
1311 {(char_u *)NULL, (char_u *)0L} 1320 {(char_u *)NULL, (char_u *)0L}
1312 #endif 1321 #endif
1313 SCRIPTID_INIT}, 1322 SCRIPTID_INIT},
1314 {"guifont", "gfn", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP, 1323 {"guifont", "gfn", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP,
1315 #ifdef FEAT_GUI 1324 #ifdef FEAT_GUI
1316 (char_u *)&p_guifont, PV_NONE, 1325 (char_u *)&p_guifont, PV_NONE,
1317 {(char_u *)"", (char_u *)0L} 1326 {(char_u *)"", (char_u *)0L}
1318 #else 1327 #else
1319 (char_u *)NULL, PV_NONE, 1328 (char_u *)NULL, PV_NONE,
1320 {(char_u *)NULL, (char_u *)0L} 1329 {(char_u *)NULL, (char_u *)0L}
1321 #endif 1330 #endif
1322 SCRIPTID_INIT}, 1331 SCRIPTID_INIT},
1323 {"guifontset", "gfs", P_STRING|P_VI_DEF|P_RCLR|P_COMMA, 1332 {"guifontset", "gfs", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA,
1324 #if defined(FEAT_GUI) && defined(FEAT_XFONTSET) 1333 #if defined(FEAT_GUI) && defined(FEAT_XFONTSET)
1325 (char_u *)&p_guifontset, PV_NONE, 1334 (char_u *)&p_guifontset, PV_NONE,
1326 {(char_u *)"", (char_u *)0L} 1335 {(char_u *)"", (char_u *)0L}
1327 #else 1336 #else
1328 (char_u *)NULL, PV_NONE, 1337 (char_u *)NULL, PV_NONE,
1329 {(char_u *)NULL, (char_u *)0L} 1338 {(char_u *)NULL, (char_u *)0L}
1330 #endif 1339 #endif
1331 SCRIPTID_INIT}, 1340 SCRIPTID_INIT},
1332 {"guifontwide", "gfw", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP, 1341 {"guifontwide", "gfw", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP,
1333 #if defined(FEAT_GUI) && defined(FEAT_MBYTE) 1342 #if defined(FEAT_GUI) && defined(FEAT_MBYTE)
1334 (char_u *)&p_guifontwide, PV_NONE, 1343 (char_u *)&p_guifontwide, PV_NONE,
1335 {(char_u *)"", (char_u *)0L} 1344 {(char_u *)"", (char_u *)0L}
1336 #else 1345 #else
1337 (char_u *)NULL, PV_NONE, 1346 (char_u *)NULL, PV_NONE,
1395 (char_u *)&p_hh, PV_NONE, 1404 (char_u *)&p_hh, PV_NONE,
1396 #else 1405 #else
1397 (char_u *)NULL, PV_NONE, 1406 (char_u *)NULL, PV_NONE,
1398 #endif 1407 #endif
1399 {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT}, 1408 {(char_u *)20L, (char_u *)0L} SCRIPTID_INIT},
1400 {"helplang", "hlg", P_STRING|P_VI_DEF|P_COMMA, 1409 {"helplang", "hlg", P_STRING|P_VI_DEF|P_ONECOMMA,
1401 #ifdef FEAT_MULTI_LANG 1410 #ifdef FEAT_MULTI_LANG
1402 (char_u *)&p_hlg, PV_NONE, 1411 (char_u *)&p_hlg, PV_NONE,
1403 {(char_u *)"", (char_u *)0L} 1412 {(char_u *)"", (char_u *)0L}
1404 #else 1413 #else
1405 (char_u *)NULL, PV_NONE, 1414 (char_u *)NULL, PV_NONE,
1407 #endif 1416 #endif
1408 SCRIPTID_INIT}, 1417 SCRIPTID_INIT},
1409 {"hidden", "hid", P_BOOL|P_VI_DEF, 1418 {"hidden", "hid", P_BOOL|P_VI_DEF,
1410 (char_u *)&p_hid, PV_NONE, 1419 (char_u *)&p_hid, PV_NONE,
1411 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1420 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1412 {"highlight", "hl", P_STRING|P_VI_DEF|P_RCLR|P_COMMA|P_NODUP, 1421 {"highlight", "hl", P_STRING|P_VI_DEF|P_RCLR|P_ONECOMMA|P_NODUP,
1413 (char_u *)&p_hl, PV_NONE, 1422 (char_u *)&p_hl, PV_NONE,
1414 {(char_u *)HIGHLIGHT_INIT, (char_u *)0L} 1423 {(char_u *)HIGHLIGHT_INIT, (char_u *)0L}
1415 SCRIPTID_INIT}, 1424 SCRIPTID_INIT},
1416 {"history", "hi", P_NUM|P_VIM, 1425 {"history", "hi", P_NUM|P_VIM,
1417 (char_u *)&p_hi, PV_NONE, 1426 (char_u *)&p_hi, PV_NONE,
1538 #else 1547 #else
1539 (char_u *)NULL, PV_NONE, 1548 (char_u *)NULL, PV_NONE,
1540 {(char_u *)0L, (char_u *)0L} 1549 {(char_u *)0L, (char_u *)0L}
1541 #endif 1550 #endif
1542 SCRIPTID_INIT}, 1551 SCRIPTID_INIT},
1543 {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, 1552 {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
1544 #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) 1553 #if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
1545 (char_u *)&p_indk, PV_INDK, 1554 (char_u *)&p_indk, PV_INDK,
1546 {(char_u *)"0{,0},:,0#,!^F,o,O,e", (char_u *)0L} 1555 {(char_u *)"0{,0},:,0#,!^F,o,O,e", (char_u *)0L}
1547 #else 1556 #else
1548 (char_u *)NULL, PV_NONE, 1557 (char_u *)NULL, PV_NONE,
1649 #else 1658 #else
1650 (char_u *)NULL, PV_NONE, 1659 (char_u *)NULL, PV_NONE,
1651 {(char_u *)"", (char_u *)0L} 1660 {(char_u *)"", (char_u *)0L}
1652 #endif 1661 #endif
1653 SCRIPTID_INIT}, 1662 SCRIPTID_INIT},
1654 {"keymodel", "km", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 1663 {"keymodel", "km", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
1655 (char_u *)&p_km, PV_NONE, 1664 (char_u *)&p_km, PV_NONE,
1656 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 1665 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
1657 {"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE, 1666 {"keywordprg", "kp", P_STRING|P_EXPAND|P_VI_DEF|P_SECURE,
1658 (char_u *)&p_kp, PV_KP, 1667 (char_u *)&p_kp, PV_KP,
1659 { 1668 {
1673 # endif 1682 # endif
1674 # endif 1683 # endif
1675 #endif 1684 #endif
1676 #endif 1685 #endif
1677 (char_u *)0L} SCRIPTID_INIT}, 1686 (char_u *)0L} SCRIPTID_INIT},
1678 {"langmap", "lmap", P_STRING|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE, 1687 {"langmap", "lmap", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP|P_SECURE,
1679 #ifdef FEAT_LANGMAP 1688 #ifdef FEAT_LANGMAP
1680 (char_u *)&p_langmap, PV_NONE, 1689 (char_u *)&p_langmap, PV_NONE,
1681 {(char_u *)"", /* unmatched } */ 1690 {(char_u *)"", /* unmatched } */
1682 #else 1691 #else
1683 (char_u *)NULL, PV_NONE, 1692 (char_u *)NULL, PV_NONE,
1741 (char_u *)&p_lisp, PV_LISP, 1750 (char_u *)&p_lisp, PV_LISP,
1742 #else 1751 #else
1743 (char_u *)NULL, PV_NONE, 1752 (char_u *)NULL, PV_NONE,
1744 #endif 1753 #endif
1745 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1754 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1746 {"lispwords", "lw", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 1755 {"lispwords", "lw", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
1747 #ifdef FEAT_LISP 1756 #ifdef FEAT_LISP
1748 (char_u *)&p_lispwords, PV_LW, 1757 (char_u *)&p_lispwords, PV_LW,
1749 {(char_u *)LISPWORD_VALUE, (char_u *)0L} 1758 {(char_u *)LISPWORD_VALUE, (char_u *)0L}
1750 #else 1759 #else
1751 (char_u *)NULL, PV_NONE, 1760 (char_u *)NULL, PV_NONE,
1753 #endif 1762 #endif
1754 SCRIPTID_INIT}, 1763 SCRIPTID_INIT},
1755 {"list", NULL, P_BOOL|P_VI_DEF|P_RWIN, 1764 {"list", NULL, P_BOOL|P_VI_DEF|P_RWIN,
1756 (char_u *)VAR_WIN, PV_LIST, 1765 (char_u *)VAR_WIN, PV_LIST,
1757 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1766 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1758 {"listchars", "lcs", P_STRING|P_VI_DEF|P_RALL|P_COMMA|P_NODUP, 1767 {"listchars", "lcs", P_STRING|P_VI_DEF|P_RALL|P_ONECOMMA|P_NODUP,
1759 (char_u *)&p_lcs, PV_NONE, 1768 (char_u *)&p_lcs, PV_NONE,
1760 {(char_u *)"eol:$", (char_u *)0L} SCRIPTID_INIT}, 1769 {(char_u *)"eol:$", (char_u *)0L} SCRIPTID_INIT},
1761 {"loadplugins", "lpl", P_BOOL|P_VI_DEF, 1770 {"loadplugins", "lpl", P_BOOL|P_VI_DEF,
1762 (char_u *)&p_lpl, PV_NONE, 1771 (char_u *)&p_lpl, PV_NONE,
1763 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, 1772 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
1789 #else 1798 #else
1790 (char_u *)NULL, PV_NONE, 1799 (char_u *)NULL, PV_NONE,
1791 {(char_u *)NULL, (char_u *)0L} 1800 {(char_u *)NULL, (char_u *)0L}
1792 #endif 1801 #endif
1793 SCRIPTID_INIT}, 1802 SCRIPTID_INIT},
1794 {"matchpairs", "mps", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, 1803 {"matchpairs", "mps", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
1795 (char_u *)&p_mps, PV_MPS, 1804 (char_u *)&p_mps, PV_MPS,
1796 {(char_u *)"(:),{:},[:]", (char_u *)0L} 1805 {(char_u *)"(:),{:},[:]", (char_u *)0L}
1797 SCRIPTID_INIT}, 1806 SCRIPTID_INIT},
1798 {"matchtime", "mat", P_NUM|P_VI_DEF, 1807 {"matchtime", "mat", P_NUM|P_VI_DEF,
1799 (char_u *)&p_mat, PV_NONE, 1808 (char_u *)&p_mat, PV_NONE,
1894 # else 1903 # else
1895 (char_u *)"extend", 1904 (char_u *)"extend",
1896 # endif 1905 # endif
1897 #endif 1906 #endif
1898 (char_u *)0L} SCRIPTID_INIT}, 1907 (char_u *)0L} SCRIPTID_INIT},
1899 {"mouseshape", "mouses", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 1908 {"mouseshape", "mouses", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
1900 #ifdef FEAT_MOUSESHAPE 1909 #ifdef FEAT_MOUSESHAPE
1901 (char_u *)&p_mouseshape, PV_NONE, 1910 (char_u *)&p_mouseshape, PV_NONE,
1902 {(char_u *)"i-r:beam,s:updown,sd:udsizing,vs:leftright,vd:lrsizing,m:no,ml:up-arrow,v:rightup-arrow", (char_u *)0L} 1911 {(char_u *)"i-r:beam,s:updown,sd:udsizing,vs:leftright,vd:lrsizing,m:no,ml:up-arrow,v:rightup-arrow", (char_u *)0L}
1903 #else 1912 #else
1904 (char_u *)NULL, PV_NONE, 1913 (char_u *)NULL, PV_NONE,
1916 #endif 1925 #endif
1917 {(char_u *)100L, (char_u *)100L} SCRIPTID_INIT}, 1926 {(char_u *)100L, (char_u *)100L} SCRIPTID_INIT},
1918 {"novice", NULL, P_BOOL|P_VI_DEF, 1927 {"novice", NULL, P_BOOL|P_VI_DEF,
1919 (char_u *)NULL, PV_NONE, 1928 (char_u *)NULL, PV_NONE,
1920 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1929 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1921 {"nrformats", "nf", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_NODUP, 1930 {"nrformats", "nf", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
1922 (char_u *)&p_nf, PV_NF, 1931 (char_u *)&p_nf, PV_NF,
1923 {(char_u *)"octal,hex", (char_u *)0L} 1932 {(char_u *)"octal,hex", (char_u *)0L}
1924 SCRIPTID_INIT}, 1933 SCRIPTID_INIT},
1925 {"number", "nu", P_BOOL|P_VI_DEF|P_RWIN, 1934 {"number", "nu", P_BOOL|P_VI_DEF|P_RWIN,
1926 (char_u *)VAR_WIN, PV_NU, 1935 (char_u *)VAR_WIN, PV_NU,
2080 #else 2089 #else
2081 (char_u *)NULL, PV_NONE, 2090 (char_u *)NULL, PV_NONE,
2082 {(char_u *)NULL, (char_u *)0L} 2091 {(char_u *)NULL, (char_u *)0L}
2083 #endif 2092 #endif
2084 SCRIPTID_INIT}, 2093 SCRIPTID_INIT},
2085 {"printoptions", "popt", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 2094 {"printoptions", "popt", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
2086 #ifdef FEAT_PRINTER 2095 #ifdef FEAT_PRINTER
2087 (char_u *)&p_popt, PV_NONE, 2096 (char_u *)&p_popt, PV_NONE,
2088 {(char_u *)"", (char_u *)0L} 2097 {(char_u *)"", (char_u *)0L}
2089 #else 2098 #else
2090 (char_u *)NULL, PV_NONE, 2099 (char_u *)NULL, PV_NONE,
2130 (char_u *)VAR_WIN, PV_RNU, 2139 (char_u *)VAR_WIN, PV_RNU,
2131 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 2140 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
2132 {"remap", NULL, P_BOOL|P_VI_DEF, 2141 {"remap", NULL, P_BOOL|P_VI_DEF,
2133 (char_u *)&p_remap, PV_NONE, 2142 (char_u *)&p_remap, PV_NONE,
2134 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, 2143 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
2135 {"renderoptions", "rop", P_STRING|P_COMMA|P_RCLR|P_VI_DEF, 2144 {"renderoptions", "rop", P_STRING|P_ONECOMMA|P_RCLR|P_VI_DEF,
2136 #ifdef FEAT_RENDER_OPTIONS 2145 #ifdef FEAT_RENDER_OPTIONS
2137 (char_u *)&p_rop, PV_NONE, 2146 (char_u *)&p_rop, PV_NONE,
2138 {(char_u *)"", (char_u *)0L} 2147 {(char_u *)"", (char_u *)0L}
2139 #else 2148 #else
2140 (char_u *)NULL, PV_NONE, 2149 (char_u *)NULL, PV_NONE,
2186 (char_u *)&p_ruf, PV_NONE, 2195 (char_u *)&p_ruf, PV_NONE,
2187 #else 2196 #else
2188 (char_u *)NULL, PV_NONE, 2197 (char_u *)NULL, PV_NONE,
2189 #endif 2198 #endif
2190 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 2199 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2191 {"runtimepath", "rtp", P_STRING|P_VI_DEF|P_EXPAND|P_COMMA|P_NODUP|P_SECURE, 2200 {"runtimepath", "rtp", P_STRING|P_VI_DEF|P_EXPAND|P_ONECOMMA|P_NODUP
2201 |P_SECURE,
2192 (char_u *)&p_rtp, PV_NONE, 2202 (char_u *)&p_rtp, PV_NONE,
2193 {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L} 2203 {(char_u *)DFLT_RUNTIMEPATH, (char_u *)0L}
2194 SCRIPTID_INIT}, 2204 SCRIPTID_INIT},
2195 {"scroll", "scr", P_NUM|P_NO_MKRC|P_VI_DEF, 2205 {"scroll", "scr", P_NUM|P_NO_MKRC|P_VI_DEF,
2196 (char_u *)VAR_WIN, PV_SCROLL, 2206 (char_u *)VAR_WIN, PV_SCROLL,
2206 (char_u *)&p_sj, PV_NONE, 2216 (char_u *)&p_sj, PV_NONE,
2207 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT}, 2217 {(char_u *)1L, (char_u *)0L} SCRIPTID_INIT},
2208 {"scrolloff", "so", P_NUM|P_VI_DEF|P_VIM|P_RALL, 2218 {"scrolloff", "so", P_NUM|P_VI_DEF|P_VIM|P_RALL,
2209 (char_u *)&p_so, PV_NONE, 2219 (char_u *)&p_so, PV_NONE,
2210 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, 2220 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
2211 {"scrollopt", "sbo", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 2221 {"scrollopt", "sbo", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
2212 #ifdef FEAT_SCROLLBIND 2222 #ifdef FEAT_SCROLLBIND
2213 (char_u *)&p_sbo, PV_NONE, 2223 (char_u *)&p_sbo, PV_NONE,
2214 {(char_u *)"ver,jump", (char_u *)0L} 2224 {(char_u *)"ver,jump", (char_u *)0L}
2215 #else 2225 #else
2216 (char_u *)NULL, PV_NONE, 2226 (char_u *)NULL, PV_NONE,
2226 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 2236 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
2227 {"selection", "sel", P_STRING|P_VI_DEF, 2237 {"selection", "sel", P_STRING|P_VI_DEF,
2228 (char_u *)&p_sel, PV_NONE, 2238 (char_u *)&p_sel, PV_NONE,
2229 {(char_u *)"inclusive", (char_u *)0L} 2239 {(char_u *)"inclusive", (char_u *)0L}
2230 SCRIPTID_INIT}, 2240 SCRIPTID_INIT},
2231 {"selectmode", "slm", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 2241 {"selectmode", "slm", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
2232 (char_u *)&p_slm, PV_NONE, 2242 (char_u *)&p_slm, PV_NONE,
2233 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 2243 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2234 {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 2244 {"sessionoptions", "ssop", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
2235 #ifdef FEAT_SESSION 2245 #ifdef FEAT_SESSION
2236 (char_u *)&p_ssop, PV_NONE, 2246 (char_u *)&p_ssop, PV_NONE,
2237 {(char_u *)"blank,buffers,curdir,folds,help,options,tabpages,winsize", 2247 {(char_u *)"blank,buffers,curdir,folds,help,options,tabpages,winsize",
2238 (char_u *)0L} 2248 (char_u *)0L}
2239 #else 2249 #else
2438 #else 2448 #else
2439 (char_u *)NULL, PV_NONE, 2449 (char_u *)NULL, PV_NONE,
2440 {(char_u *)0L, (char_u *)0L} 2450 {(char_u *)0L, (char_u *)0L}
2441 #endif 2451 #endif
2442 SCRIPTID_INIT}, 2452 SCRIPTID_INIT},
2443 {"spellfile", "spf", P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE|P_COMMA, 2453 {"spellfile", "spf", P_STRING|P_EXPAND|P_ALLOCED|P_VI_DEF|P_SECURE
2454 |P_ONECOMMA,
2444 #ifdef FEAT_SPELL 2455 #ifdef FEAT_SPELL
2445 (char_u *)&p_spf, PV_SPF, 2456 (char_u *)&p_spf, PV_SPF,
2446 {(char_u *)"", (char_u *)0L} 2457 {(char_u *)"", (char_u *)0L}
2447 #else 2458 #else
2448 (char_u *)NULL, PV_NONE, 2459 (char_u *)NULL, PV_NONE,
2449 {(char_u *)0L, (char_u *)0L} 2460 {(char_u *)0L, (char_u *)0L}
2450 #endif 2461 #endif
2451 SCRIPTID_INIT}, 2462 SCRIPTID_INIT},
2452 {"spelllang", "spl", P_STRING|P_ALLOCED|P_VI_DEF|P_COMMA|P_RBUF|P_EXPAND, 2463 {"spelllang", "spl", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA
2464 |P_RBUF|P_EXPAND,
2453 #ifdef FEAT_SPELL 2465 #ifdef FEAT_SPELL
2454 (char_u *)&p_spl, PV_SPL, 2466 (char_u *)&p_spl, PV_SPL,
2455 {(char_u *)"en", (char_u *)0L} 2467 {(char_u *)"en", (char_u *)0L}
2456 #else 2468 #else
2457 (char_u *)NULL, PV_NONE, 2469 (char_u *)NULL, PV_NONE,
2458 {(char_u *)0L, (char_u *)0L} 2470 {(char_u *)0L, (char_u *)0L}
2459 #endif 2471 #endif
2460 SCRIPTID_INIT}, 2472 SCRIPTID_INIT},
2461 {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_COMMA, 2473 {"spellsuggest", "sps", P_STRING|P_VI_DEF|P_EXPAND|P_SECURE|P_ONECOMMA,
2462 #ifdef FEAT_SPELL 2474 #ifdef FEAT_SPELL
2463 (char_u *)&p_sps, PV_NONE, 2475 (char_u *)&p_sps, PV_NONE,
2464 {(char_u *)"best", (char_u *)0L} 2476 {(char_u *)"best", (char_u *)0L}
2465 #else 2477 #else
2466 (char_u *)NULL, PV_NONE, 2478 (char_u *)NULL, PV_NONE,
2489 (char_u *)&p_stl, PV_STL, 2501 (char_u *)&p_stl, PV_STL,
2490 #else 2502 #else
2491 (char_u *)NULL, PV_NONE, 2503 (char_u *)NULL, PV_NONE,
2492 #endif 2504 #endif
2493 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 2505 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2494 {"suffixes", "su", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 2506 {"suffixes", "su", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
2495 (char_u *)&p_su, PV_NONE, 2507 (char_u *)&p_su, PV_NONE,
2496 {(char_u *)".bak,~,.o,.h,.info,.swp,.obj", 2508 {(char_u *)".bak,~,.o,.h,.info,.swp,.obj",
2497 (char_u *)0L} SCRIPTID_INIT}, 2509 (char_u *)0L} SCRIPTID_INIT},
2498 {"suffixesadd", "sua", P_STRING|P_VI_DEF|P_ALLOCED|P_COMMA|P_NODUP, 2510 {"suffixesadd", "sua", P_STRING|P_VI_DEF|P_ALLOCED|P_ONECOMMA|P_NODUP,
2499 #ifdef FEAT_SEARCHPATH 2511 #ifdef FEAT_SEARCHPATH
2500 (char_u *)&p_sua, PV_SUA, 2512 (char_u *)&p_sua, PV_SUA,
2501 {(char_u *)"", (char_u *)0L} 2513 {(char_u *)"", (char_u *)0L}
2502 #else 2514 #else
2503 (char_u *)NULL, PV_NONE, 2515 (char_u *)NULL, PV_NONE,
2508 (char_u *)&p_swf, PV_SWF, 2520 (char_u *)&p_swf, PV_SWF,
2509 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, 2521 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
2510 {"swapsync", "sws", P_STRING|P_VI_DEF, 2522 {"swapsync", "sws", P_STRING|P_VI_DEF,
2511 (char_u *)&p_sws, PV_NONE, 2523 (char_u *)&p_sws, PV_NONE,
2512 {(char_u *)"fsync", (char_u *)0L} SCRIPTID_INIT}, 2524 {(char_u *)"fsync", (char_u *)0L} SCRIPTID_INIT},
2513 {"switchbuf", "swb", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 2525 {"switchbuf", "swb", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
2514 (char_u *)&p_swb, PV_NONE, 2526 (char_u *)&p_swb, PV_NONE,
2515 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 2527 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2516 {"synmaxcol", "smc", P_NUM|P_VI_DEF|P_RBUF, 2528 {"synmaxcol", "smc", P_NUM|P_VI_DEF|P_RBUF,
2517 #ifdef FEAT_SYN_HL 2529 #ifdef FEAT_SYN_HL
2518 (char_u *)&p_smc, PV_SMC, 2530 (char_u *)&p_smc, PV_SMC,
2560 (char_u *)&p_tl, PV_NONE, 2572 (char_u *)&p_tl, PV_NONE,
2561 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, 2573 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
2562 {"tagrelative", "tr", P_BOOL|P_VIM, 2574 {"tagrelative", "tr", P_BOOL|P_VIM,
2563 (char_u *)&p_tr, PV_NONE, 2575 (char_u *)&p_tr, PV_NONE,
2564 {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT}, 2576 {(char_u *)FALSE, (char_u *)TRUE} SCRIPTID_INIT},
2565 {"tags", "tag", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, 2577 {"tags", "tag", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP,
2566 (char_u *)&p_tags, PV_TAGS, 2578 (char_u *)&p_tags, PV_TAGS,
2567 { 2579 {
2568 #if defined(FEAT_EMACS_TAGS) && !defined(CASE_INSENSITIVE_FILENAME) 2580 #if defined(FEAT_EMACS_TAGS) && !defined(CASE_INSENSITIVE_FILENAME)
2569 (char_u *)"./tags,./TAGS,tags,TAGS", 2581 (char_u *)"./tags,./TAGS,tags,TAGS",
2570 #else 2582 #else
2610 #endif 2622 #endif
2611 (char_u *)0L} SCRIPTID_INIT}, 2623 (char_u *)0L} SCRIPTID_INIT},
2612 {"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM|P_RBUF, 2624 {"textwidth", "tw", P_NUM|P_VI_DEF|P_VIM|P_RBUF,
2613 (char_u *)&p_tw, PV_TW, 2625 (char_u *)&p_tw, PV_TW,
2614 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, 2626 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
2615 {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP, 2627 {"thesaurus", "tsr", P_STRING|P_EXPAND|P_VI_DEF|P_ONECOMMA|P_NODUP,
2616 #ifdef FEAT_INS_EXPAND 2628 #ifdef FEAT_INS_EXPAND
2617 (char_u *)&p_tsr, PV_TSR, 2629 (char_u *)&p_tsr, PV_TSR,
2618 #else 2630 #else
2619 (char_u *)NULL, PV_NONE, 2631 (char_u *)NULL, PV_NONE,
2620 #endif 2632 #endif
2658 #else 2670 #else
2659 (char_u *)NULL, PV_NONE, 2671 (char_u *)NULL, PV_NONE,
2660 #endif 2672 #endif
2661 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 2673 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2662 #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32) 2674 #if defined(FEAT_TOOLBAR) && !defined(FEAT_GUI_W32)
2663 {"toolbar", "tb", P_STRING|P_COMMA|P_VI_DEF|P_NODUP, 2675 {"toolbar", "tb", P_STRING|P_ONECOMMA|P_VI_DEF|P_NODUP,
2664 (char_u *)&p_toolbar, PV_NONE, 2676 (char_u *)&p_toolbar, PV_NONE,
2665 {(char_u *)"icons,tooltips", (char_u *)0L} 2677 {(char_u *)"icons,tooltips", (char_u *)0L}
2666 SCRIPTID_INIT}, 2678 SCRIPTID_INIT},
2667 #endif 2679 #endif
2668 #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK) 2680 #if defined(FEAT_TOOLBAR) && defined(FEAT_GUI_GTK)
2693 (char_u *)&p_ttyscroll, PV_NONE, 2705 (char_u *)&p_ttyscroll, PV_NONE,
2694 {(char_u *)999L, (char_u *)0L} SCRIPTID_INIT}, 2706 {(char_u *)999L, (char_u *)0L} SCRIPTID_INIT},
2695 {"ttytype", "tty", P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL, 2707 {"ttytype", "tty", P_STRING|P_EXPAND|P_NODEFAULT|P_NO_MKRC|P_VI_DEF|P_RALL,
2696 (char_u *)&T_NAME, PV_NONE, 2708 (char_u *)&T_NAME, PV_NONE,
2697 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 2709 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
2698 {"undodir", "udir", P_STRING|P_EXPAND|P_COMMA|P_NODUP|P_SECURE|P_VI_DEF, 2710 {"undodir", "udir", P_STRING|P_EXPAND|P_ONECOMMA|P_NODUP|P_SECURE
2711 |P_VI_DEF,
2699 #ifdef FEAT_PERSISTENT_UNDO 2712 #ifdef FEAT_PERSISTENT_UNDO
2700 (char_u *)&p_udir, PV_NONE, 2713 (char_u *)&p_udir, PV_NONE,
2701 {(char_u *)".", (char_u *)0L} 2714 {(char_u *)".", (char_u *)0L}
2702 #else 2715 #else
2703 (char_u *)NULL, PV_NONE, 2716 (char_u *)NULL, PV_NONE,
2742 #else 2755 #else
2743 (char_u *)NULL, PV_NONE, 2756 (char_u *)NULL, PV_NONE,
2744 {(char_u *)0L, (char_u *)0L} 2757 {(char_u *)0L, (char_u *)0L}
2745 #endif 2758 #endif
2746 SCRIPTID_INIT}, 2759 SCRIPTID_INIT},
2747 {"viewoptions", "vop", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 2760 {"viewoptions", "vop", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
2748 #ifdef FEAT_SESSION 2761 #ifdef FEAT_SESSION
2749 (char_u *)&p_vop, PV_NONE, 2762 (char_u *)&p_vop, PV_NONE,
2750 {(char_u *)"folds,options,cursor", (char_u *)0L} 2763 {(char_u *)"folds,options,cursor", (char_u *)0L}
2751 #else 2764 #else
2752 (char_u *)NULL, PV_NONE, 2765 (char_u *)NULL, PV_NONE,
2753 {(char_u *)0L, (char_u *)0L} 2766 {(char_u *)0L, (char_u *)0L}
2754 #endif 2767 #endif
2755 SCRIPTID_INIT}, 2768 SCRIPTID_INIT},
2756 {"viminfo", "vi", P_STRING|P_COMMA|P_NODUP|P_SECURE, 2769 {"viminfo", "vi", P_STRING|P_ONECOMMA|P_NODUP|P_SECURE,
2757 #ifdef FEAT_VIMINFO 2770 #ifdef FEAT_VIMINFO
2758 (char_u *)&p_viminfo, PV_NONE, 2771 (char_u *)&p_viminfo, PV_NONE,
2759 #if defined(MSDOS) || defined(MSWIN) || defined(OS2) 2772 #if defined(MSDOS) || defined(MSWIN) || defined(OS2)
2760 {(char_u *)"", (char_u *)"'100,<50,s10,h,rA:,rB:"} 2773 {(char_u *)"", (char_u *)"'100,<50,s10,h,rA:,rB:"}
2761 #else 2774 #else
2769 #else 2782 #else
2770 (char_u *)NULL, PV_NONE, 2783 (char_u *)NULL, PV_NONE,
2771 {(char_u *)0L, (char_u *)0L} 2784 {(char_u *)0L, (char_u *)0L}
2772 #endif 2785 #endif
2773 SCRIPTID_INIT}, 2786 SCRIPTID_INIT},
2774 {"virtualedit", "ve", P_STRING|P_COMMA|P_NODUP|P_VI_DEF|P_VIM|P_CURSWANT, 2787 {"virtualedit", "ve", P_STRING|P_ONECOMMA|P_NODUP|P_VI_DEF
2788 |P_VIM|P_CURSWANT,
2775 #ifdef FEAT_VIRTUALEDIT 2789 #ifdef FEAT_VIRTUALEDIT
2776 (char_u *)&p_ve, PV_NONE, 2790 (char_u *)&p_ve, PV_NONE,
2777 {(char_u *)"", (char_u *)""} 2791 {(char_u *)"", (char_u *)""}
2778 #else 2792 #else
2779 (char_u *)NULL, PV_NONE, 2793 (char_u *)NULL, PV_NONE,
2796 (char_u *)&p_warn, PV_NONE, 2810 (char_u *)&p_warn, PV_NONE,
2797 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT}, 2811 {(char_u *)TRUE, (char_u *)0L} SCRIPTID_INIT},
2798 {"weirdinvert", "wiv", P_BOOL|P_VI_DEF|P_RCLR, 2812 {"weirdinvert", "wiv", P_BOOL|P_VI_DEF|P_RCLR,
2799 (char_u *)&p_wiv, PV_NONE, 2813 (char_u *)&p_wiv, PV_NONE,
2800 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 2814 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
2801 {"whichwrap", "ww", P_STRING|P_VIM|P_COMMA|P_FLAGLIST, 2815 {"whichwrap", "ww", P_STRING|P_VIM|P_ONECOMMA|P_FLAGLIST,
2802 (char_u *)&p_ww, PV_NONE, 2816 (char_u *)&p_ww, PV_NONE,
2803 {(char_u *)"", (char_u *)"b,s"} SCRIPTID_INIT}, 2817 {(char_u *)"", (char_u *)"b,s"} SCRIPTID_INIT},
2804 {"wildchar", "wc", P_NUM|P_VIM, 2818 {"wildchar", "wc", P_NUM|P_VIM,
2805 (char_u *)&p_wc, PV_NONE, 2819 (char_u *)&p_wc, PV_NONE,
2806 {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB} 2820 {(char_u *)(long)Ctrl_E, (char_u *)(long)TAB}
2807 SCRIPTID_INIT}, 2821 SCRIPTID_INIT},
2808 {"wildcharm", "wcm", P_NUM|P_VI_DEF, 2822 {"wildcharm", "wcm", P_NUM|P_VI_DEF,
2809 (char_u *)&p_wcm, PV_NONE, 2823 (char_u *)&p_wcm, PV_NONE,
2810 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT}, 2824 {(char_u *)0L, (char_u *)0L} SCRIPTID_INIT},
2811 {"wildignore", "wig", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 2825 {"wildignore", "wig", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
2812 #ifdef FEAT_WILDIGN 2826 #ifdef FEAT_WILDIGN
2813 (char_u *)&p_wig, PV_NONE, 2827 (char_u *)&p_wig, PV_NONE,
2814 #else 2828 #else
2815 (char_u *)NULL, PV_NONE, 2829 (char_u *)NULL, PV_NONE,
2816 #endif 2830 #endif
2823 (char_u *)&p_wmnu, PV_NONE, 2837 (char_u *)&p_wmnu, PV_NONE,
2824 #else 2838 #else
2825 (char_u *)NULL, PV_NONE, 2839 (char_u *)NULL, PV_NONE,
2826 #endif 2840 #endif
2827 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 2841 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
2828 {"wildmode", "wim", P_STRING|P_VI_DEF|P_COMMA|P_NODUP, 2842 {"wildmode", "wim", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
2829 (char_u *)&p_wim, PV_NONE, 2843 (char_u *)&p_wim, PV_NONE,
2830 {(char_u *)"full", (char_u *)0L} SCRIPTID_INIT}, 2844 {(char_u *)"full", (char_u *)0L} SCRIPTID_INIT},
2831 {"wildoptions", "wop", P_STRING|P_VI_DEF, 2845 {"wildoptions", "wop", P_STRING|P_VI_DEF,
2832 #ifdef FEAT_CMDL_COMPL 2846 #ifdef FEAT_CMDL_COMPL
2833 (char_u *)&p_wop, PV_NONE, 2847 (char_u *)&p_wop, PV_NONE,
4828 && *newval != NUL); 4842 && *newval != NUL);
4829 if (adding) 4843 if (adding)
4830 { 4844 {
4831 i = (int)STRLEN(origval); 4845 i = (int)STRLEN(origval);
4832 /* strip a trailing comma, would get 2 */ 4846 /* strip a trailing comma, would get 2 */
4833 if (comma && i > 1 && origval[i - 1] == ',' 4847 if (comma && (flags & P_ONECOMMA) && i > 1
4848 && origval[i - 1] == ','
4834 && origval[i - 2] != '\\') 4849 && origval[i - 2] != '\\')
4835 i--; 4850 i--;
4836 mch_memmove(newval + i + comma, newval, 4851 mch_memmove(newval + i + comma, newval,
4837 STRLEN(newval) + 1); 4852 STRLEN(newval) + 1);
4838 mch_memmove(newval, origval, (size_t)i); 4853 mch_memmove(newval, origval, (size_t)i);