From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-41616-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 19662 invoked by alias); 28 Aug 2017 22:07:59 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 41616
Received: (qmail 13677 invoked by uid 1010); 28 Aug 2017 22:07:59 -0000
X-Qmail-Scanner-Diagnostics: from nm8-vm6.bullet.mail.ir2.yahoo.com by f.primenet.com.au (envelope-from <okiddle@yahoo.co.uk>, uid 7791) with qmail-scanner-2.11 
 (clamdscan: 0.99.2/21882. spamassassin: 3.4.1.  
 Clear:RC:0(212.82.96.140):SA:0(-4.7/5.0):. 
 Processed in 1.134879 secs); 28 Aug 2017 22:07:59 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00,FREEMAIL_FROM,
	RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_PASS,T_DKIM_INVALID autolearn=ham
	autolearn_force=no version=3.4.1
X-Envelope-From: okiddle@yahoo.co.uk
X-Qmail-Scanner-Mime-Attachments: |
X-Qmail-Scanner-Zip-Files: |
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.co.uk; s=s2048; t=1503957475; bh=Sq+Gu0QVIM8kjY2sC7xjm3tP1EMlHQ6pY0ostPeToyk=; h=From:To:Subject:Date:From:Subject; b=f3rbwRmweIKQWmucz04lh/uVIqtw6xDK6bXnar898ucrE3l9NqUlztqpokGFRRwUNpg4BUKyXdOdD634BI+Qvz5vpFnOt1ChNIdHAsoIrG75KHnJSlm/47LwoYiN0pozTI2V0kY9pas7fPolLjCtOKBE2qpwjiTUqF8+mPLdBxpvvcnbQESX4bCc6Up6LVSCIXWHLO9i2O+GP/tixt6RafcxUBRWpkQ+aIC0P+59/yGYIEhwV264gW4zBxWhfh4uazv+YLSriaMTxzB9GqFGRZHM1SpU/F6KD7S+soEAPwFtGcbO0+c8K6V+6Q+6YlS8NkYv5ebqZFmHy/EOpSqJiw==
X-Yahoo-Newman-Id: 580238.67477.bm@smtp117.mail.ir2.yahoo.com
X-Yahoo-Newman-Property: ymail-3
X-YMail-OSG: ..f8jYYVM1kXFfmhalYLFKTzgtkWlKQdyTyyBaveanv1C5S
 nLLw2PmfYSbblkhRH7ObRCo9.xyyonynZt3vBBD6.BP30fOGDn2k.laqjfuq
 tw0UkzY0OiVbW9uPUCzSluPx4G4uymOQ28Y.cYVKjh8cP_SC0v4_rEd6S7Ny
 HW43O4jAJPfgLyykepnz0EUkSb5bq05StQuALmv32N5sC_v0FxvG9kHBYx7c
 y3z_oJFb1oZPeGLIQrqUdphO.z5MQ4FtLOaPb7O4X42Gbxp21QLzJ_76xxGN
 IDte8P7VC1X85fuI7ecqFyq8VKse..pDpI.1Zg5akX1rBPzEmeQOUtfGBfmM
 tXzpYJL15HQJjvm4EOrrLbh.ILww.S0E.OcHjnM3VrGKlnWf1NBP0yKvDr2m
 gZsTfR93fn6WWeyIBJhduul6_x_ardpMY34.z3cKqQ0nJEPe846iQoicFOTb
 5Iohsvc5i4PkQ5Yw8rZV25HYXARatcmUduoU1OjOUAGDYzA--
X-Yahoo-SMTP: opAkk_CswBAce_kJ3nIPlH80cJI-
From: Oliver Kiddle <okiddle@yahoo.co.uk>
To: Zsh workers <zsh-workers@zsh.org>
Subject: PATCH: update entr completion
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-ID: <6928.1503957467.1@thecus.kiddle.eu>
Date: Mon, 28 Aug 2017 23:57:47 +0200
Message-ID: <6929.1503957467@thecus.kiddle.eu>

entr 3.8 adds a -s option.

Oliver

diff --git a/Completion/Unix/Command/_entr b/Completion/Unix/Command/_entr
index 8a830ae71..a8d43fc5e 100644
--- a/Completion/Unix/Command/_entr
+++ b/Completion/Unix/Command/_entr
@@ -1,9 +1,23 @@
 #compdef entr
 
+local curcontext="$curcontext" state state_descr line ret=1
+typeset -A opt_args
+
 _arguments -s -S \
   '-c[execute clear before invoking utility]' \
   '-d[track directories and exit if a new file is added]' \
   '-p[postpone first execution of the utility]' \
   '-r[reload a persistent child process]' \
-  '(-):command name:_command_names -e' \
-  '*::arguments:_normal'
+  '(*)-s[evaluate the first argument using interpreter specified by $SHELL]' \
+  '(-): :->command' \
+  '*::arguments:_normal' && ret=0
+
+if [[ -n $state ]]; then
+  if (( $+opt_args[-s] )); then
+    _cmdstring && ret=0
+  else
+    _command_names -e && ret=0
+  fi
+fi
+
+return ret