about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBart Schaefer <barts@users.sourceforge.net>2000-09-14 15:54:54 +0000
committerBart Schaefer <barts@users.sourceforge.net>2000-09-14 15:54:54 +0000
commita12ff424b683d74fbd973d06227fb90a0f87d3e1 (patch)
tree8c9f9f20b9ff44e673d60612b6ae331b41cc8006
parent879b24619ac23aef70a5d694453135238eac2045 (diff)
downloadzsh-a12ff424b683d74fbd973d06227fb90a0f87d3e1.tar.gz
zsh-a12ff424b683d74fbd973d06227fb90a0f87d3e1.tar.xz
zsh-a12ff424b683d74fbd973d06227fb90a0f87d3e1.zip
12804: Fix "typeset -m".
-rw-r--r--ChangeLog13
-rw-r--r--Src/builtin.c1
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c397f67c..c43bfdf24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2000-09-14  Bart Schaefer  <schaefer@brasslantern.com>
+
+	* 12804: Src/builtin.c: "typeset -m" implies "-g".
+
+	* unposted: Completion/Commands/_complete_debug: Changed my mind
+	about the edit to 12800.
+
+2000-09-13  Bart Schaefer  <schaefer@zsh.org>
+
+	* 12800: E. Jay Berkenbilt: Completion/Commands/_complete_debug:
+	Quote the file name pushed onto the history, in case the command
+	word has strange characters in it.  (Slighty edited.)
+
 2000-09-11  Bart Schaefer  <schaefer@brasslantern.com>
 
 	* 12793: Completion/Builtins/_zle, Doc/Zsh/compwid.yo,
diff --git a/Src/builtin.c b/Src/builtin.c
index 864fd41b9..742527e00 100644
--- a/Src/builtin.c
+++ b/Src/builtin.c
@@ -1942,6 +1942,7 @@ bin_typeset(char *name, char **argv, char *ops, int func)
 
     /* With the -m option, treat arguments as glob patterns */
     if (ops['m']) {
+	on &= ~PM_LOCAL;
 	while ((asg = getasg(*argv++))) {
 	    LinkList pmlist = newlinklist();
 	    LinkNode pmnode;