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.4 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 10190 invoked from network); 16 Oct 2023 08:40:23 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 16 Oct 2023 08:40:23 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1697445623; b=XK3IatC4XNZWlgOpkvH1sYqhO5mVDLK9EgGdMomnWin/HOVkGaHLtVYcYY+tHVdQfd3n5jpfOu be7tJ0wMIuAr/deyKPU7MOo5q+lC6qDseMS/oNisfDu1KL/LAWRix8HBgVcl2PWmNC9uvl4bl6 lsVXB+vVsNjcBmhzK1Mii81qgTu0VWd1WLbBu1qyfDAoNUolMWLDa52ku7jkTcr0b/2EStfinY Kx4bdrX0OU7ObabiOtZMUdQY1NrK131eM9xChfCyFlhaE0VTnXUGh4Tms0Daii+A69WDA1B+F+ kkcZS7cNxgIxRJOLXH8DTGdJDnO7C3g3S00P+hfeuqnoNQ==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-lf1-f54.google.com) smtp.remote-ip=209.85.167.54; dkim=pass header.d=gmail.com header.s=20230601 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed; d=zsh.org; s=rsa-20210803; t=1697445623; bh=uQTdeU6gL9NNNF7cpruvTUWlNt5Lyq5T27oxgaWQB/E=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:Message-ID:Date: Subject:To:From:DKIM-Signature:DKIM-Signature; b=YB/HrTcfkukLuM33HbiXutU6xypn8msANbo5KNKLHpn2cmnu1VG4XhKDbEh+7Q9LJsG2GsZzJb VcdsIqrYK1UzzaB6Mar31aJNryRMwi/jkBNIwQbgpsRS1N7bo8IHkhvFEfiwvMFASs6O+iixYJ qcKnVktj0Ol3vjOL9OmdcF6sSCRroOTD9oB46HXC4KY7bfvlNKra4X6LGqcoHh233CuWfwX5zN bfGD0TsGOleglsuGIJGZtUO1UO8PzYgsqz5TJ4W5GauKYPU2+Wd5ZKxPZmcA6wqPjbVWRoL9mI Z+LaM9u0PxyspHlHK/4Hh8kDItDPcyPH3bZ/7apvxJa7gg==; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20210803; h=List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Sender:Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References; bh=1o/DAOklaFPLephPRwJlFj6MoEQ8bCCV9bNTiFieNz4=; b=UT7nA9HLqiVg2RMfSYWZIbYAw9 TK4qwmMcYXzRhZbM5uEGC8Ilphyo8IsvfuEeJAXLEOBu0zSurC5/KvD0jY+KhJk/SVHCLEtxyLVgc 0fQ9HVhdCv8tvDPyMhj2XastD2UW0/WuYrfG2JTrRVgJzBrimpFM/BkRFce4VD7pbkIhU0T0ImFg3 kiYE5mAECOavTYP4XS9KFqd+tW2Nfglepvq9BNIjuob4Dnhcd4maDs2qh2YsRbsyrCZT04XRSaBUz 0L7R5SHw/sdZv3+FJCCKARBN9ylpkSMrgmYxMF0gDb4cfBF8Vb5QO1C4ZZhPWimaXqj6flkbmEa3h U/oyvmgw==; Received: by zero.zsh.org with local id 1qsJ9D-000IFn-2U; Mon, 16 Oct 2023 08:40:23 +0000 Authentication-Results: zsh.org; iprev=pass (mail-lf1-f54.google.com) smtp.remote-ip=209.85.167.54; dkim=pass header.d=gmail.com header.s=20230601 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-lf1-f54.google.com ([209.85.167.54]:59422) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1qsJ7y-000HMc-3e; Mon, 16 Oct 2023 08:39:06 +0000 Received: by mail-lf1-f54.google.com with SMTP id 2adb3069b0e04-5041d6d8b10so5421521e87.2 for ; Mon, 16 Oct 2023 01:39:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697445545; x=1698050345; darn=zsh.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=1o/DAOklaFPLephPRwJlFj6MoEQ8bCCV9bNTiFieNz4=; b=B+rkzsCxzrO0QGqEZ8G9nu87s072Yf13ur48FaD8+xdTO3cibbsfbVYxaofiUPcVTB RqLp2k3Yn/VGM4kiiUTTyzRq6heXhGMj7JlsdvkDI66Q5ypwQaG8WE3fgApnuZtQXMCE 3I66RKL58veXw15GO9pmoPRusenIxevNndvHjN208MAzL63mgRo9e/MM8NqF9pwu+/I9 VBTMwj/dW+Feb7rluA5M4KqdWdm22suFyKqpsU2ihIj+hMakbDd/xR+PolUYsPX5s3Q3 r2srtzkKsVHjLXH1BDCod70/jCieFZ1jQimoeoNgIgTInHueNhM7GmHLbujxPdW+JGBc obiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697445545; x=1698050345; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1o/DAOklaFPLephPRwJlFj6MoEQ8bCCV9bNTiFieNz4=; b=Si3kzEqVz/RxmZ3RUrchARkm9IB2qIJOuAWj+yKrvYr/wpHYUtY9+OGdedgR+fjycA h5Uc2e+PzzqFL2PgM9pj0BXetQcgCOJXu34Ex5m1bvqXkNBiwa4o0J+n27Exrp6pGthg wjER81KHk30dQgFhVLQw6eqHwPt61/fwUcVEDVi024ykcAKQKKybNWlG8zGPfqzgQsAD fVDdcrwTYfo1wQhVu2BrUePbu/v21NbIKKZNHO6k14D+Q114OtRx9gjemzc2shRdkc41 9jaAjmk6WLPZdGlLFUhTJLYipk5PUVTYpLl17HpJJM4rYAFHOC6xFHD11kr1Q3iWR5VZ mbYQ== X-Gm-Message-State: AOJu0Yy5VG5YTzmtTPn279e7Gc0dOmVTdRrW5gRQ24TCri0auRNdWXYC iKKqcGbApUsfhQ5M8Z72pZnSxY0evrI= X-Google-Smtp-Source: AGHT+IHfNZYtE2GuJUcwd/HUpMmRIqQGHoex/mQjKRfpQDZXwcmcz6PIURTSSFJZiDBopbrstgq/NA== X-Received: by 2002:a05:6512:10d5:b0:503:3890:ca3a with SMTP id k21-20020a05651210d500b005033890ca3amr32338859lfg.66.1697445545310; Mon, 16 Oct 2023 01:39:05 -0700 (PDT) Received: from localhost.localdomain (h-94-254-94-11.A230.priv.bahnhof.se. [94.254.94.11]) by smtp.gmail.com with ESMTPSA id b4-20020a056512070400b00502e2ab7118sm657570lfs.50.2023.10.16.01.39.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Oct 2023 01:39:05 -0700 (PDT) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH: Don't complete history modifiers when assigning parameter Date: Mon, 16 Oct 2023 10:39:04 +0200 Message-Id: <20231016083904.4761-1-mikachu@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 52223 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: --- Completion/Zsh/Type/_command_names | 4 ++-- Completion/Zsh/Type/_parameters | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Completion/Zsh/Type/_command_names b/Completion/Zsh/Type/_command_names index e77f9b72f6..26c87ffc3d 100644 --- a/Completion/Zsh/Type/_command_names +++ b/Completion/Zsh/Type/_command_names @@ -36,8 +36,8 @@ else 'suffix-aliases:suffix alias:_suffix_alias_files' 'reserved-words:reserved word:compadd -Qk reswords' 'jobs:: _jobs -t' - 'parameters:: _parameters -g "^*(readonly|association)*" -qS= -r "\n\t\- =[+"' - 'parameters:: _parameters -g "*association*~*readonly*" -qS\[ -r "\n\t\- =[+"' + 'parameters:: _parameters -h -g "^*(readonly|association)*" -qS= -r "\n\t\- =[+"' + 'parameters:: _parameters -h -g "*association*~*readonly*" -qS\[ -r "\n\t\- =[+"' ) if zstyle -t ":completion:${curcontext}:aliases" verbose; then diff --git a/Completion/Zsh/Type/_parameters b/Completion/Zsh/Type/_parameters index 7f6f33e0ee..45dbb881ae 100644 --- a/Completion/Zsh/Type/_parameters +++ b/Completion/Zsh/Type/_parameters @@ -6,7 +6,9 @@ # If you specify a -g option with a pattern, the pattern will be used to # restrict the type of parameters matched. -if compset -P '*:'; then +local assignment +zparseopts -D -K -E h=assignment +if [[ $assignment != -h ]] && compset -P '*:'; then _history_modifiers p return fi -- 2.38.1