From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8412 invoked from network); 27 Nov 2004 07:16:34 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 27 Nov 2004 07:16:34 -0000 Received: (qmail 6961 invoked from network); 27 Nov 2004 07:16:29 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 27 Nov 2004 07:16:29 -0000 Received: (qmail 9591 invoked by alias); 27 Nov 2004 07:16:14 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 20584 Received: (qmail 9577 invoked from network); 27 Nov 2004 07:16:14 -0000 Received: from unknown (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 27 Nov 2004 07:16:14 -0000 Received: (qmail 6511 invoked from network); 27 Nov 2004 07:15:15 -0000 Received: from grunt22.ihug.com.au (203.109.249.142) by a.mx.sunsite.dk with SMTP; 27 Nov 2004 07:15:13 -0000 Received: from 203-173-54-176.dyn.iinet.net.au (localhost.localdomain) [203.173.54.176] by grunt22.ihug.com.au with esmtp (Exim 3.35 #1 (Debian)) id 1CXwnT-0001MJ-00; Sat, 27 Nov 2004 18:15:08 +1100 Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by localhost.localdomain (8.12.8/8.12.8) with ESMTP id iAR7F4po007948 for ; Sat, 27 Nov 2004 18:15:05 +1100 Received: (from doug@localhost) by localhost.localdomain (8.12.8/8.12.8/Submit) id iAR7F3rr007944 for zsh-workers@sunsite.dk; Sat, 27 Nov 2004 18:15:03 +1100 X-Authentication-Warning: localhost.localdomain: doug set sender to dougkearns@gmail.com using -f Date: Sat, 27 Nov 2004 18:15:03 +1100 From: Doug Kearns To: zsh-workers@sunsite.dk Subject: Re: PATCH: screen session completion Message-ID: <20041127071503.GA4088@localhost.localdomain> Mail-Followup-To: zsh-workers@sunsite.dk References: <20041121042747.GC3922@localhost.localdomain> <20041123232452.GG3928@localhost.localdomain> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20041123232452.GG3928@localhost.localdomain> User-Agent: Mutt/1.4i X-Spam-Checker-Version: SpamAssassin 2.63 on a.mx.sunsite.dk X-Spam-Level: X-Spam-Status: No, hits=0.0 required=6.0 tests=none autolearn=no version=2.63 X-Spam-Hits: 0.0 On Wed, Nov 24, 2004 at 10:24:52AM +1100, Doug Kearns wrote: > On Sun, Nov 21, 2004 at 03:27:47PM +1100, Doug Kearns wrote: > > Screen session completion seems to be broken; here's a quick fix. > > A little too quick; I'll come up with a proper fix shortly... This will pick up multiuser sessions as well. Regards, Doug Index: Completion/Unix/Command/_screen =================================================================== RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_screen,v retrieving revision 1.6 diff -u -r1.6 _screen --- Completion/Unix/Command/_screen 7 Aug 2004 19:01:24 -0000 1.6 +++ Completion/Unix/Command/_screen 26 Nov 2004 17:01:51 -0000 @@ -76,18 +76,18 @@ case $state in attached-sessions) sessions=( - ${${${${(f)"$(_call_program screen-sessions $words[1] \ - -ls)"}[2,-3]##[[:blank:]]}:#*Detached*}%[[:blank:]]*} + ${${${(M)${(f)"$(_call_program screen-sessions $words[1] \ + -ls)"}:#*[Aa]ttached*}##[[:blank:]]}%%[[:blank:]]*} ) ;; detached-sessions) sessions=( - ${${${${(f)"$(_call_program screen-sessions $words[1] \ - -ls)"}[2,-3]##[[:blank:]]}:#*Attached*}%[[:blank:]]*} + ${${${(M)${(f)"$(_call_program screen-sessions $words[1] \ + -ls)"}:#*[Dd]etached*}##[[:blank:]]}%%[[:blank:]]*} ) ;; esac - + # check if initial PID is necessary to make sessions unambiguous if [[ ${#${(u)sessions#*.}} -lt $#sessions ]]; then _wanted screen-sessions expl "${state%-*} screen process" \