summaryrefslogtreecommitdiff
path: root/src/option.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-03-08 21:32:40 +0000
committerBram Moolenaar <Bram@vim.org>2006-03-08 21:32:40 +0000
commita3227e2b15600b2303e3aac070803021e76ed6d5 (patch)
tree28e62d3adfb3021ca3b92b6f86cb772d4a0ae9c8 /src/option.c
parent1f35bf9cab16d3f3a63c47894c69c9aa699d8145 (diff)
downloadvim-git-a3227e2b15600b2303e3aac070803021e76ed6d5.tar.gz
updated for version 7.0218v7.0218
Diffstat (limited to 'src/option.c')
-rw-r--r--src/option.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c
index 5c957e5e9..b14b4f986 100644
--- a/src/option.c
+++ b/src/option.c
@@ -3774,9 +3774,11 @@ set_title_defaults()
* does not need to be expanded with option_expand().
* "opt_flags":
* 0 for ":set"
- * OPT_GLOBAL for ":setglobal"
- * OPT_LOCAL for ":setlocal" and a modeline
+ * OPT_GLOBAL for ":setglobal"
+ * OPT_LOCAL for ":setlocal" and a modeline
* OPT_MODELINE for a modeline
+ * OPT_WINONLY to only set window-local options
+ * OPT_NOWIN to skip setting window-local options
*
* returns FAIL if an error is detected, OK otherwise
*/
@@ -3977,6 +3979,11 @@ do_set(arg, opt_flags)
&& (opt_idx < 0 || options[opt_idx].var != VAR_WIN))
goto skip;
+ /* Skip all options that are window-local (used for :vimgrep). */
+ if ((opt_flags & OPT_NOWIN) && opt_idx >= 0
+ && options[opt_idx].var == VAR_WIN)
+ goto skip;
+
/* Disallow changing some options from modelines */
if ((opt_flags & OPT_MODELINE) && (flags & P_SECURE))
{