From 485cbbb6cc6ac9d7c13a8268b3574829026f3797 Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Sun, 14 Feb 2016 13:10:06 -0800
Subject: 37972: Redirect stderr to /dev/null in cases where ${~param} might
 generate errors

---
 Completion/Base/Widget/_correct_filename | 2 +-
 Completion/Base/Widget/_most_recent_file | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Completion/Base/Widget')

diff --git a/Completion/Base/Widget/_correct_filename b/Completion/Base/Widget/_correct_filename
index 7431a4831..3150ffcdb 100644
--- a/Completion/Base/Widget/_correct_filename
+++ b/Completion/Base/Widget/_correct_filename
@@ -28,7 +28,7 @@ fi
 
 if [[ $file = \~*/* ]]; then
   tilde=${file%%/*}
-  etilde=${~tilde}
+  etilde=${~tilde} 2>/dev/null
   file=${file/#$tilde/$etilde}
 fi
 
diff --git a/Completion/Base/Widget/_most_recent_file b/Completion/Base/Widget/_most_recent_file
index 68d1c91a2..e72cf5e8d 100644
--- a/Completion/Base/Widget/_most_recent_file
+++ b/Completion/Base/Widget/_most_recent_file
@@ -11,7 +11,7 @@
 local file tilde etilde
 if [[ $PREFIX = \~*/* ]]; then
   tilde=${PREFIX%%/*}
-  etilde=${~tilde}
+  etilde=${~tilde} 2>/dev/null
   # PREFIX and SUFFIX have full command line quoting in, but we want
   # any globbing characters which are quoted to stay quoted.
   eval "file=($PREFIX*$SUFFIX(om[${NUMERIC:-1}]N))"
-- 
cgit v1.2.3


From 8142fc3fdbaa43a20eeb6da3f4c9099973e4f1e3 Mon Sep 17 00:00:00 2001
From: "Barton E. Schaefer" <schaefer@zsh.org>
Date: Sat, 9 Apr 2016 08:54:54 -0700
Subject: For help listing, capture the fallback to compctl in case there is
 one defined

---
 ChangeLog                             | 5 +++++
 Completion/Base/Widget/_complete_help | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'Completion/Base/Widget')

diff --git a/ChangeLog b/ChangeLog
index bf20a5f23..ac26813ee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-04-09  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* unposted:  Completion/Base/Widget/_complete_help: capture the
+	fallback to compctl in case there is one defined
+
 2016-04-09  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
 	* 38255: Completion/Unix/Command/_git: Fix argument pastedness.
diff --git a/Completion/Base/Widget/_complete_help b/Completion/Base/Widget/_complete_help
index 09637ecb9..252b0e281 100644
--- a/Completion/Base/Widget/_complete_help
+++ b/Completion/Base/Widget/_complete_help
@@ -11,6 +11,7 @@ _complete_help() {
 
   {
     compadd() { return 1 }
+    compcall() { _help_sort_tags use-compctl }
     zstyle() {
       local _f="${${(@)${(@)funcstack[2,(i)_($~_help_scan_funcstack)]}:#(_($~_help_filter_funcstack)|\((eval|anon)\))}% *}"
   
@@ -42,7 +43,7 @@ _complete_help() {
 
     ${1:-_main_complete}
   } always {
-    unfunction compadd zstyle
+    unfunction compadd compcall zstyle
   }
 
   for i in "${(@ok)help_funcs}"; do
-- 
cgit v1.2.3