about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2011-01-07 09:41:49 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2011-01-07 09:41:49 +0000
commit21ee383e28f1e0fb31be0aa0c2d9a0cba26ccc8e (patch)
treeea187f10be9e5bd4ec9a344220b71868c1e64f55
parent6318e041d17a3dc82589cf324afa115b6c907dfe (diff)
downloadzsh-21ee383e28f1e0fb31be0aa0c2d9a0cba26ccc8e.tar.gz
zsh-21ee383e28f1e0fb31be0aa0c2d9a0cba26ccc8e.tar.xz
zsh-21ee383e28f1e0fb31be0aa0c2d9a0cba26ccc8e.zip
Mikael: 28585: don't set ret=0 on failure in _mkdir
-rw-r--r--ChangeLog7
-rw-r--r--Completion/Unix/Command/_mkdir5
2 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5bef8dc69..fddf16222 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-01-07  Peter Stephenson  <pws@csr.com>
+
+	* Mikael: 28585: Completion/Unix/Command/_mkdir: don't set ret=0
+	when _wanted fails to find any matches.
+
 2011-01-06  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* unposted: Src/utils.c: fix argument type for write_loop().
@@ -14061,5 +14066,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.5173 $
+* $Revision: 1.5174 $
 *****************************************************
diff --git a/Completion/Unix/Command/_mkdir b/Completion/Unix/Command/_mkdir
index 927b9dfe9..b5f75198f 100644
--- a/Completion/Unix/Command/_mkdir
+++ b/Completion/Unix/Command/_mkdir
@@ -60,9 +60,8 @@ case "$state" in
     if (( $ret )) && [[ ! -prefix - ]] || \
       [[ $variant == zsh && ${#${${words[2,-1]}:#-*}} -gt 0 ]]; then
       _wanted directories expl \
-	'parent directory (alternatively specify name of directory)' \
-	_path_files -/ || _message 'name of directory'
-      ret=0
+        'parent directory (alternatively specify name of directory)' \
+        _path_files -/ && ret=0 || _message 'name of directory'
     fi
     ;;
 esac