about summary refs log tree commit diff
diff options
context:
space:
mode:
authorSebastian Gniazdowski <psprint3@fastmail.com>2017-04-01 09:41:49 -0700
committerBarton E. Schaefer <schaefer@zsh.org>2017-04-01 09:43:34 -0700
commit967ff2f5cf9270a0ef01cb3a7a8f8d941ec2bcb6 (patch)
tree3e16a87f47aca98e204530504bb33b9a0154ab5f
parent48501165545140148d82ba047e3f73a8bde1fe08 (diff)
downloadzsh-967ff2f5cf9270a0ef01cb3a7a8f8d941ec2bcb6.tar.gz
zsh-967ff2f5cf9270a0ef01cb3a7a8f8d941ec2bcb6.tar.xz
zsh-967ff2f5cf9270a0ef01cb3a7a8f8d941ec2bcb6.zip
* 40782: avoid dependency on zsh/regex module
-rw-r--r--ChangeLog5
-rw-r--r--Completion/Unix/Type/_hosts5
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 02693d959..044bbb0df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2017-04-01  Barton E. Schaefer  <schaefer@zsh.org>
+
+	* Sebastian: 40782: Completion/Unix/Type/_hosts: avoid dependency
+	on zsh/regex module
+
 2017-03-30  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* Dag-Erling Smørgrav: 40915: Completion/BSD/Command/_kld: fix
diff --git a/Completion/Unix/Type/_hosts b/Completion/Unix/Type/_hosts
index 56540865e..d9e1090a4 100644
--- a/Completion/Unix/Type/_hosts
+++ b/Completion/Unix/Type/_hosts
@@ -50,12 +50,13 @@ if ! zstyle -a ":completion:${curcontext}:hosts" hosts _hosts; then
         # entries.
         () {
           local host
+          local -a match mbegin mend
           khosts=()
           for host; do
             if [[ $host == *[*?]* ]]; then
               continue
-            elif [[ $host =~ "\[(.*)\]:\d*" ]]; then
-              khosts+=$match
+            elif [[ $host = (#b)*\[(*)\]:[[:digit:]]#* ]]; then
+              khosts+=${match[1]}
             else
               khosts+=$host
             fi