summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Command/_mount24
2 files changed, 8 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index e9df215ea..b5c1f296c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-29  Mikael Magnusson  <mikachu@gmail.com>
+
+	* 33963: Completion/Unix/Command/_mount: remove work of art
+	in _mount
+
 2014-12-28  Barton E. Schaefer  <schaefer@zsh.org>
 
 	* Daniel Shahaf: 34070: Src/Zle/zle_refresh.c: fix starting
diff --git a/Completion/Unix/Command/_mount b/Completion/Unix/Command/_mount
index 04282225f..a3b58bb87 100644
--- a/Completion/Unix/Command/_mount
+++ b/Completion/Unix/Command/_mount
@@ -959,27 +959,9 @@ udevordir)
   esac
 
   local MATCH MBEGIN MEND
-  # "Mummy, why is mount point matching full of squiggles?"
-  #
-  # "Well, dear, the clever people who wrote Linux decided that some
-  # funny characters that might confuse programmes looking at the names
-  # would be encoded as octal escapes, like for example \040 for space.
-  # The clever people who wrote zsh decided that nothing would
-  # ever be quite as simple as it should be, so to substitute octal
-  # escapes everywhere in a string, even though the shell understands
-  # them natively in print escapes, needs some hackery where you match
-  # the octal number using the numeric closure syntax introduced after
-  # 4.3.4, then reinput the number in a standard math mode format as 8#OOO,
-  # and turn that into a character using the (#) parameter flag."
-  #
-  # "Mummy, why is nothing ever quite as simple as it should be?"
-  #
-  # "Well, dear, if it was then the clever people who write programmes would
-  # have been replaced by intelligent monkeys and then they'd be out
-  # of working roaming the streets, and we wouldn't want that, would we?"
-  mp_tmp=("${(@q)mp_tmp//(#m)\\[0-7](#c3)/${(#)$(( 8#${MATCH[2,-1]} ))}}")
-  dpath_tmp=( "${(@Mq)dev_tmp:#/*}" )
-  dev_tmp=( "${(@q)dev_tmp:#/*}" )
+  mp_tmp=("${(@qg::)mp_tmp}")
+  dpath_tmp=( "${(@Mqg::)dev_tmp:#/*}" )
+  dev_tmp=( "${(@qg::)dev_tmp:#/*}" )
 
   _alternative \
     'device-labels:device label:compadd -a dev_tmp' \