From 8d4cde6301efa6c639ae481a5045460335f4490a Mon Sep 17 00:00:00 2001
From: Julien Nicoulaud <julien.nicoulaud@gmail.com>
Date: Tue, 20 Sep 2011 19:13:03 +0200
Subject: [PATCH] (Hopefully) fix #21 (tilde and hashed directories in paths)

---
 highlighters/main/main-highlighter.zsh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/highlighters/main/main-highlighter.zsh b/highlighters/main/main-highlighter.zsh
index 7d3b935..4ec8353 100755
--- a/highlighters/main/main-highlighter.zsh
+++ b/highlighters/main/main-highlighter.zsh
@@ -153,10 +153,11 @@ _zsh_highlight_main_highlighter_check_assign()
 # Check if the argument is a path.
 _zsh_highlight_main_highlighter_check_path()
 {
-  [[ -z "${(Q)~arg}" ]] && return 1
-  [[ -e "${(Q)~arg}" ]] && return 0
-  [[ ! -e "${(Q)~arg:h}" ]] && return 1
-  [[ ${BUFFER[1]} != "-" && ${#BUFFER} == $end_pos && -n $(print "${(Q)~arg}"*(N)) ]] && return 0
+  local expanded_path; : ${expanded_path:=${(Q)~arg}}
+  [[ -z "$expanded_path" ]] && return 1
+  [[ -e "$expanded_path" ]] && return 0
+  [[ ! -e "${expanded_path:h}" ]] && return 1
+  [[ ${BUFFER[1]} != "-" && ${#BUFFER} == $end_pos && -n $(print "${expanded_path}"*(N)) ]] && return 0
   return 1
 }