From mboxrd@z Thu Jan 1 00:00:00 1970 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on inbox.vuxu.org X-Spam-Level: X-Spam-Status: No, score=-3.3 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 21855 invoked from network); 13 Dec 2020 04:16:11 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 13 Dec 2020 04:16:11 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20200801; t=1607832971; b=uzGs5buj9JgzeQ6u+OcKP5rcOc72Bnx7ARqsfDxpPY2W9v3SpNc3zhlKMkpN8ZYT9YWuJI5D9p QD4PGyiUrwD7PePbCU+GKwskAgmwgT82RPvlktrL7ruFTjyvFL47kuC6EqKJfKbFp+KoxdDHQ3 nmVH8fQwxMfSbe5MRw6DpxgKdFFdyLQSrFnXeE2k39PJ/aNr59u1SJ/jgUu+OE+u+rHBpu6KfW YMdwGY/bqrcagxe0UrkLOM7H58LaTsBv4AVtU4Jh+JcvGgjL8q8QK8C8QeJUq3CkGYq9j43sxY Ms6Yp9zoz1oDt3QYbI6ZMhHa8H3HdWr1vcewjzJ3WzwUfg==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-il1-f177.google.com) smtp.remote-ip=209.85.166.177; dkim=pass header.d=dana-is.20150623.gappssmtp.com header.s=20150623 header.a=rsa-sha256; dmarc=none header.from=dana.is; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20200801; t=1607832971; bh=kHB4KJAdJBwhRrM3g905uHH9/y+8XY6FfqQqGLgP+/k=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:To:Cc:Date:Message-ID:Subject:MIME-Version: Content-Transfer-Encoding:Content-Type:From:DKIM-Signature:DKIM-Signature; b=IHbfsBlb2HPX9JSpZprF/uzYkHu4wYxK0CunqGIm8tOWbzuDmQeoRI8M7e17uTEVNeW5aF1cfl A/Gb2G8uboygeKG/X4ufezAYFbKdcH/7iQ5k2crlStYtiDfN44ZTP2eA7mnYUECMzlaonJwx9g bSRZfaDk0J3wHOf4T/67+LExvVJwxlts6VNDG9ZM1bh9kFiT69EGTRY+0yYt0mdWIfH7c43i+e F3+8teTS9u7akvl+LIYgRA6J7e7XX8Jo3NH+j3Eb7xbyKjekojWX+K7WXF+xNJEj49617/1n1T /1keRKFct96JFmlDYILdxbx9h/Ac2JCOlnT9MIZT28YMbA==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20200801; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:To:Cc:Date:Message-Id:Subject: Mime-Version:Content-Transfer-Encoding:Content-Type:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References; bh=x4xTJvS0DmuHGdJi4RKz5JEYx/tHhTYZECVnZc8nS+E=; b=etTujt3aYnTmy7wyf8DpWnbMsY whE3fJpTwxsi3NFSrMsVkw+wg2MSlbZCxMmAv6JMqrT8ms7X+gqIosQlgnNUuYUN0wWvMSpSVg3/w nXZ5hc6/ADjQhWH+noKL9l92mRL6HTWnVxsCCMI7aUenJV5/SWdTpHioaUEEZqIzUPrYDHiYN5JQp 3Sky2sRKukMUetd2NWSxL5kKFcZVMHsQ64mVVsziZoxTo39HISbIUngSYr6KVGenLD2WY2obq/b5O zkrhe/G183Agd8qmdk/FT1j6BAATNQAOx/d9t2RFAsg6p3O7kNkbhzwNbNHsQ4Vdhb+GzPt8297tJ peRrZDEg==; Received: from authenticated user by zero.zsh.org with local id 1koInm-0007nm-Qh; Sun, 13 Dec 2020 04:16:06 +0000 Authentication-Results: zsh.org; iprev=pass (mail-il1-f177.google.com) smtp.remote-ip=209.85.166.177; dkim=pass header.d=dana-is.20150623.gappssmtp.com header.s=20150623 header.a=rsa-sha256; dmarc=none header.from=dana.is; arc=none Received: from mail-il1-f177.google.com ([209.85.166.177]:43942) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1koInX-0007ep-K5; Sun, 13 Dec 2020 04:15:53 +0000 Received: by mail-il1-f177.google.com with SMTP id c18so12657273iln.10 for ; Sat, 12 Dec 2020 20:15:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=dana-is.20150623.gappssmtp.com; s=20150623; h=from:content-transfer-encoding:mime-version:subject:message-id:date :cc:to; bh=x4xTJvS0DmuHGdJi4RKz5JEYx/tHhTYZECVnZc8nS+E=; b=Evcb/EUAgF2Q2Yt/dk56ipadLwmFD3L7MSlFRqTf85AzQake9qwQU29FrdHfvSDClU FazX6YbjSvTH0yP/pjgb+giAQARdx2BERBXOxsXSVdFMjjXeVK1McdQJ1krY01uCUSZj GKrN4Xn7FXZnWWXrCs5qfFRmSLZJnNri93KptZgXclrWayKQPG32GwFJwymgRJFqs/p0 dn+2vn89LoLPpFoUMEYPeFWgz6Ucxjl9/O9799xxRuE3gvqh4n3h9sb73iL4XlXov/B9 oReMM68Dp2I/nkpRK4E/ANT2P66eocIppYRPyIHO7SxcTAMaddh/J98j3OnipgzmgRQZ XfxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:content-transfer-encoding:mime-version :subject:message-id:date:cc:to; bh=x4xTJvS0DmuHGdJi4RKz5JEYx/tHhTYZECVnZc8nS+E=; b=hQaiTECvccTj2Lgx96M7qvOHhd7mGS5Tywy8T9xZk2JG+TiRXoaKzJw1Dgw//Owy1F 6+w4nWpDQDdWXuXbeU0p6hM2UfZJ00OqVXN+GcfXkcMYzKLg3ggap03DclhKC0PmtW0f o0UiV0/uCkQkF2OmISP5Dxi84Kl6bjfwrWSvW5kzuVW+2vHOeI6Ongs/80x9tuR5DKlf 3fMgXcwSAX+lChgaKOheS/0tzGqE1jNs244flENrVdO/KKKGCxDFBoMgo5rEeHBJItlF xx39HFpLtUz05t9cN9WlsOB2yFYaJHcxIIv//AWCn2ALhvmFwFv1R7S3blk8MTV2wWWS Qqww== X-Gm-Message-State: AOAM532orE0U06ugRkNotAv7itvUDLVfEkk222yPKcgnDO4rXq8XL1Xr 7G/OtOxIlztF6cWsdOsLG3ewsRA1cs6wYA== X-Google-Smtp-Source: ABdhPJxih+pVdfB4xQOf8EYYn1gn240D015jVuyH939yogjdAcbuGAciP3b//wgcpSnLdU6wYcZeoA== X-Received: by 2002:a92:ba08:: with SMTP id o8mr26136396ili.249.1607832949933; Sat, 12 Dec 2020 20:15:49 -0800 (PST) Received: from heartswap.lan.dana.is (173-17-84-59.client.mchsi.com. [173.17.84.59]) by smtp.gmail.com with ESMTPSA id o63sm8639918ilb.83.2020.12.12.20.15.48 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 12 Dec 2020 20:15:49 -0800 (PST) From: dana Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: [PATCH] Fix zstyle option completion Message-Id: Date: Sat, 12 Dec 2020 22:15:47 -0600 Cc: Daniel Shahaf To: Zsh hackers list X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Seq: 47737 Archived-At: X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk Sender: zsh-workers-request@zsh.org X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: Archived-At: I often retrieve zstyle commands from history and then edit them to add = -d or whatever at the beginning. But the completion function won't complete = for you there because of the change made by Daniel in workers/39659. @Daniel: I think this achieves what you wanted without breaking my use = case, doesn't it? Or did you have something else in mind that i'm not seeing? dana diff --git a/Completion/Zsh/Command/_zstyle = b/Completion/Zsh/Command/_zstyle index 75acde5f7..9e82d8ad5 100644 --- a/Completion/Zsh/Command/_zstyle +++ b/Completion/Zsh/Command/_zstyle @@ -217,7 +217,7 @@ taglist=3D( ) =20 # Be careful with the context arguments here. They like to masquerade. -_arguments -C \ +_arguments -C -A '-*' \ '(: -)-L[output in form of zstyle commands]:pattern for context = patterns:->metapatterns:style:->metastyles' \ '(: -)-d[delete style definitions]:verbatim context = pattern:->patterns:*:styles:->pstyles' \ '(: -)-e[value is evaluated when style is looked up]:context = pattern:->contexts:style:->styles:*:command:_cmdstring' \ @@ -228,7 +228,7 @@ _arguments -C \ '(: -)-t[test a style, returning false if it'\''s undefined]:context = name:->contexts:style:->styles:*:strings to test presence of: ' \ '(: -)-T[test a style, returning true if it'\''s undefined]:context = name:->contexts:style:->styles:*:strings to test presence of: ' \ '(: -)-m[pattern-match values of a style]:context = name:->contexts:style:->styles:pattern: ' \ - '(-):context pattern:->contexts' '(-):style:->styles' = '(-)*:argument:->style-arg' + ':context pattern:->contexts' ':style:->styles' = '*:argument:->style-arg' =20 while (( $#state )); do case "$state[1]" in