summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@zsh.org>2015-12-14 10:59:03 +0000
committerPeter Stephenson <pws@zsh.org>2015-12-14 10:59:03 +0000
commit53bc8ef2d8d37d446fbf562605f5d2393c1a1e80 (patch)
tree89958efd844c20d2e451a91956b8e9d6df202128
parent9e185476f9d239ff3db3eac3163899c7cb95fd48 (diff)
downloadzsh-53bc8ef2d8d37d446fbf562605f5d2393c1a1e80.tar.gz
zsh-53bc8ef2d8d37d446fbf562605f5d2393c1a1e80.tar.xz
zsh-53bc8ef2d8d37d446fbf562605f5d2393c1a1e80.zip
37400: typo gave unwanted error message in zsh_directory_name_generic
-rw-r--r--ChangeLog5
-rw-r--r--Functions/Chpwd/zsh_directory_name_generic4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8b99d6a08..8b0528909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-12-14  Peter Stephenson  <p.stephenson@samsung.com>
+
+	* 37400: Functions/Chpwd/zsh_directory_name_generic: fix typo
+	that caused unwanted error message.
+
 2015-12-13  Peter Stephenson  <p.w.stephenson@ntlworld.com>
 
 	* 37397: Adrien Vergé: Completion/Redhat/Command/_dnf: update
diff --git a/Functions/Chpwd/zsh_directory_name_generic b/Functions/Chpwd/zsh_directory_name_generic
index 9430c95e4..aa4bf9b84 100644
--- a/Functions/Chpwd/zsh_directory_name_generic
+++ b/Functions/Chpwd/zsh_directory_name_generic
@@ -16,7 +16,7 @@ zmodload -i zsh/parameter
 zstyle -s ":zdn:${funcstack[2]}:" mapping _zdn_topvar || _zdn_topvar=zdn_top
 
 if (( ! ${(P)#_zdn_topvar} )); then
-  print -r -- "$0: $_zdn_topver is not set" >&2
+  print -r -- "$0: $_zdn_topvar is not set" >&2
   return 1
 fi
 
@@ -43,7 +43,7 @@ if [[ $1 = n ]]; then
 
     if [[ -z $_zdn_cpt ]]; then
       # If top level component, just try another expansion
-      if [[ $_zdn_var != $_zdn_top ]]; then
+      if [[ $_zdn_var != $_zdn_topvar ]]; then
 	# Committed to this expansion, so report failure.
 	print -r -- "$0: no expansion for directory name \`$_zdn_name'" >&2
       fi