summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Completion/Unix/Command/_postfix2
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 989d16e84..0b6d6b3de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2016-09-02  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
+	* unposted: Completion/Unix/Command/_postfix: _postfix_queue_id:
+	Unbreak completion of short queue ids of held/active messages,
+	broken in 39108.
+
 	* 39154: Completion/Unix/Type/_files: -/ with list-dirs-first
 	resulted in a bad pattern, thus aborting completion partway.
 
@@ -28,7 +32,7 @@
 
 2016-08-30  Daniel Shahaf  <d.s@daniel.shahaf.name>
 
-	* 39108: Completion/Unix/Command/_postfix: Support
+	* 39108 (tweaked): Completion/Unix/Command/_postfix: Support
 	$enable_long_queue_ids.
 
 	* 39110: Completion/Unix/Command/_postfix: Complete 'postconf'.
diff --git a/Completion/Unix/Command/_postfix b/Completion/Unix/Command/_postfix
index ab9518212..528034ef8 100644
--- a/Completion/Unix/Command/_postfix
+++ b/Completion/Unix/Command/_postfix
@@ -10,7 +10,7 @@ _postfix_queue_id() {
   local -a lines=( ${(f)"$(_call_program mailq 'mailq')"} )
 
   # $enable_long_queue_ids = no
-  compadd "$@" -- ${${(M)lines:#(#s)([0-9A-F]## )*}/(#s)(#b)([0-9A-F]##)*/$match[1]}
+  compadd "$@" -- ${${(M)lines:#(#s)([0-9A-F]##([*!]|) )*}/(#s)(#b)([0-9A-F]##)*/$match[1]}
 
   # $enable_long_queue_ids = yes
   compadd "$@" -- ${${${(M)lines:#(#s)[0-9bcdfghjklmnpqrstvwxyzBCDFGHJKLMNPQRSTVWXYZ](#c10)z*}%% *}%[*!]}