From 9a79a60c90ca0001f1d792dc01c0da0dcf179668 Mon Sep 17 00:00:00 2001
From: Mikael Magnusson <mikachu@gmail.com>
Date: Sat, 8 Jun 2024 17:49:54 +0200
Subject: [PATCH] 52946: Revert "Handle completer filenames with funny
 characters in them"

This reverts commit 88f47569030b12345aee3bd857e424351ee61726.
---
 ChangeLog           | 4 ++++
 Completion/compdump | 6 +++---
 Completion/compinit | 4 ++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bbd1c99be..29546095d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2024-06-08  Mikael Magnusson  <mikachu@gmail.com>
+
+	* 52946: Completion/compdump, Completion/compinit: Revert 52768
+
 2024-05-24  Bart Schaefer  <schaefer@zsh.org>
 
 	* users/29882: Etc/FAQ.yo: Explain $RANDOM predictability
diff --git a/Completion/compdump b/Completion/compdump
index 5af5174f1..6daf92f9f 100644
--- a/Completion/compdump
+++ b/Completion/compdump
@@ -113,7 +113,7 @@ integer _i=5
 print -n autoload -Uz >& $_d_fd
 while (( $#_d_als )); do
   if (( ! $+_compautos[$_d_als[1]] )); then
-    print -rn " ${(q-)_d_als[1]}"
+    print -n " $_d_als[1]"
     if (( ! --_i && $#_d_als > 1 )); then
       _i=5
       print -n ' \\\n           '
@@ -126,13 +126,13 @@ print >& $_d_fd
 
 local _c
 for _c in "${(ok@)_compautos}"; do
-  print -r "autoload -Uz ${(q-)_compautos[$_c]} $_c" >& $_d_fd
+  print "autoload -Uz $_compautos[$_c] $_c" >& $_d_fd
 done
 
 print >& $_d_fd
 
 print "typeset -gUa _comp_assocs" >& $_d_fd
-print -r "_comp_assocs=( ${(qq)_comp_assocs} )" >& $_d_fd
+print "_comp_assocs=( ${(qq)_comp_assocs} )" >& $_d_fd
 exec {_d_fd}>&-
 
 mv -f $_d_file ${_d_file%.$HOST.$$}
diff --git a/Completion/compinit b/Completion/compinit
index 51e9d88b8..5cb527fac 100644
--- a/Completion/compinit
+++ b/Completion/compinit
@@ -301,7 +301,7 @@ compdef() {
     if [[ -z "$eval" ]] && [[ "$1" = *\=* ]]; then
       while (( $# )); do
         if [[ "$1" = *\=* ]]; then
-	  cmd="${(q)${1%%\=*}}"
+	  cmd="${1%%\=*}"
 	  svc="${1#*\=}"
           func="$_comps[${_services[(r)$svc]:-$svc}]"
           [[ -n ${_services[$svc]} ]] &&
@@ -412,7 +412,7 @@ compdef() {
 	      svc=
             fi
             if [[ -z "$new" || -z "${_comps[$1]}" ]]; then
-              _comps[$cmd]="${(q)func}"
+              _comps[$cmd]="$func"
 	      [[ -n "$svc" ]] && _services[$cmd]="${1#*\=}"
 	    fi
             ;;