about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Src/options.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6aa238599..40e536a54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2015-12-19  Barton E. Schaefer  <schaefer@zsh.org>
 
+	* unposted (cf. 37387): Src/options.c: emulate turns off
+	WARN_CREATE_GLOBAL
+
 	* users/21068: Functions/Newuser/zsh-newuser-install: use emacs
 	keymap in vared by default (less surprising than vi modes)
 
diff --git a/Src/options.c b/Src/options.c
index 2678626c7..17c46c311 100644
--- a/Src/options.c
+++ b/Src/options.c
@@ -256,7 +256,7 @@ static struct optname optns[] = {
 {{NULL, "unset",	      OPT_EMULATE|OPT_BSHELL},	 UNSET},
 {{NULL, "verbose",	      0},			 VERBOSE},
 {{NULL, "vi",		      0},			 VIMODE},
-{{NULL, "warncreateglobal",   0},			 WARNCREATEGLOBAL},
+{{NULL, "warncreateglobal",   OPT_EMULATE},		 WARNCREATEGLOBAL},
 {{NULL, "xtrace",	      0},			 XTRACE},
 {{NULL, "zle",		      OPT_SPECIAL},		 USEZLE},
 {{NULL, "braceexpand",	      OPT_ALIAS}, /* ksh/bash */ -IGNOREBRACES},