summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Cook <llua@gmx.com>2015-10-27 12:15:47 -0400
committerMikael Magnusson <mikachu@gmail.com>2015-11-16 02:58:03 +0100
commit8d1e882b78e3ccc3d66cfc61e1d7e3e53f60d67f (patch)
treea8d65bc8171d51cc98d72681a321e15ea5ebfc95
parentf01cf05e538dc4c8839253aefc09d3a58654ba6a (diff)
downloadzsh-8d1e882b78e3ccc3d66cfc61e1d7e3e53f60d67f.tar.gz
zsh-8d1e882b78e3ccc3d66cfc61e1d7e3e53f60d67f.tar.xz
zsh-8d1e882b78e3ccc3d66cfc61e1d7e3e53f60d67f.zip
zed: Add -- to the `functions' builtin calls
Reported on IRC:

% autoload zed; zed -f -- "-zgen-prezto-load"
zed:83: bad option: -g
-zgen-prezto-load() {
}
-rw-r--r--ChangeLog6
-rw-r--r--Functions/Misc/zed4
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 69f5182b9..0c26ced2e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,9 @@
 2015-11-16  Mikael Magnusson  <mikachu@gmail.com>
 
-	* Eric Cook: 37050: Completion/BSD/Command/_sockstat: _sockstat:
-	minor improvements
+	* Eric Cook: 36986: Functions/Misc/zed: Add -- to the `functions'
+	builtin calls
+
+	* Eric Cook: 37050: Completion/BSD/Command/_sockstat: minor improvements
 
 2015-11-15  Barton E. Schaefer  <schaefer@zsh.org>
 
diff --git a/Functions/Misc/zed b/Functions/Misc/zed
index 94dd9ce5b..eb8f557ea 100644
--- a/Functions/Misc/zed
+++ b/Functions/Misc/zed
@@ -69,10 +69,10 @@ fi
 setopt localoptions nobanghist
 
 if ((fun)) then
-  var="$(functions $expand $1)"
+  var="$(functions $expand -- $1)"
   # If function is undefined but autoloadable, load it
   if [[ $var = *\#\ undefined* ]] then
-    var="$(autoload +X $1; functions $1)"
+    var="$(autoload +X $1; functions -- $1)"
   elif [[ -z $var ]] then
     var="$1() {
 }"