diff options
author | Bram Moolenaar <Bram@vim.org> | 2006-03-15 23:03:01 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2006-03-15 23:03:01 +0000 |
commit | 9d47f1707bab4d318febcfbd65c692b2b3962f42 (patch) | |
tree | 9d1a7c7c1e9309915133bbf009d0af41ba45f126 /src/option.c | |
parent | 7d47b6eed707db9af160ec517b71e1f9fdac1a0f (diff) | |
download | vim-9d47f1707bab4d318febcfbd65c692b2b3962f42.zip |
updated for version 7.0225
Diffstat (limited to 'src/option.c')
-rw-r--r-- | src/option.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/option.c b/src/option.c index bbb1187ac..0686b853c 100644 --- a/src/option.c +++ b/src/option.c @@ -1923,6 +1923,13 @@ static struct vimoption {"prompt", NULL, P_BOOL|P_VI_DEF, (char_u *)&p_prompt, PV_NONE, {(char_u *)TRUE, (char_u *)0L}}, + {"pumheight", "ph", P_NUM|P_VI_DEF, +#ifdef FEAT_INS_EXPAND + (char_u *)&p_ph, PV_NONE, +#else + (char_u *)NULL, PV_NONE, +#endif + {(char_u *)0L, (char_u *)0L}}, {"quoteescape", "qe", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_TEXTOBJ (char_u *)&p_qe, PV_QE, @@ -3194,7 +3201,7 @@ set_init_1() } } # else -# ifdef MACOS +# ifdef MACOS_CONVERT if (mch_getenv((char_u *)"LANG") == NULL) { char buf[20]; |