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 1745 invoked from network); 14 Sep 2023 12:10:18 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 14 Sep 2023 12:10:18 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1694693418; b=BPrn9Xnl2gneAYZoh97nkH6wkb0l6heKGbblwnPbnJ2Qj1uCakYfl+uB+yY3MJe6FaBgM921MU B3d2famuJ5FoA66cZriPtthDQD1LfoPsyb3eCxXc+R1zWf42twzGtuj5gfRvd8+mI49xgqFHE6 T7nhvjp6c6FD8cDvyRsIo23dhNhgnYstfpjtRoEHxZ47ja/SE23oJr+B5dFuZGnVrVi0VW5GGW nonHimG+ZeCnT2nsAYhUrWlJbnBCgzra2Phs/WSatGZQSb1PjVudCkUDLB3pm4Pdp2BqAWpzC0 2LISnTqb34rzJ9s8XjfVR8DqJonMvnbRW1va54mayrXnCw==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-lf1-f51.google.com) smtp.remote-ip=209.85.167.51; dkim=pass header.d=gmail.com header.s=20221208 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=1694693418; bh=VKBGmn2G62hXuooC3C+tKWEiO2nBuJZ7yHPMz4E7Wo8=; 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=LDMJtE45s0+ztWcCn5JBWMqIUepclPxg/wWggfq/ibYs5jzMnPo8VeNfdumd0i2MIoon+Gv26d XZS4PfLWNxD8jIKNsSEKCLvLSb5oI3Ayo06CqEQSgRRFTYfpXozTjZmjmdfvG6kF23fqr76Gjf TEOyC4zFqiNXdPVQEMFKuFOXlPPXJ8udLMJMfq0jfkOTd/NEMG7yQ/7KH9CBeOM75vn3GkSEK8 xxbRw+GyR2x92Dl43mb7QAXyW6rFLi+SNR/951Qsi16OPNIlH+yW/Y0OSxv9kRQrcscxu7LqgE 7LC8jtepuOB6BV+RbKGygvZ+6II7J28aHB0RGaavbRNU3g==; 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=+qyUaH+PuHgEo8IDDqrm8woZ/iib9aFnWbmBioD4EHg=; b=PhFh8CnarynFTf8ph/D9KKHgNM +ncCSIs8DqdCuCqLyU9hLZRdhFZTghYR6JCXs5SYykmeZF5EWN/tQO0C1T8dZKs2krURODsIkqMBs E/DLw5ou28g9ZoiZ7TLUyzDAL/bjFRlU89bJe3UhLnwGGji6GzSLK8RtIUYv8+lTzDSGsWrJP08cf uSRzaFqwpAi4naiZTJ3/3BsovtggTItGjGVuBzORifwr1bmOgonj8SJichxSqVBmT9oVTIMJdX7qa jsJ5sl9bBD9hdPks31J478Xv5r6Eai4lGDQRom+4iNqbkp/6RXQoBAn78ZseLVVX3FcZbxwKTjuDi p4HEZOeg==; Received: by zero.zsh.org with local id 1qglAn-000NH6-Jy; Thu, 14 Sep 2023 12:10:17 +0000 Authentication-Results: zsh.org; iprev=pass (mail-lf1-f51.google.com) smtp.remote-ip=209.85.167.51; dkim=pass header.d=gmail.com header.s=20221208 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-lf1-f51.google.com ([209.85.167.51]:54438) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1qglAa-000Mx9-7x; Thu, 14 Sep 2023 12:10:06 +0000 Received: by mail-lf1-f51.google.com with SMTP id 2adb3069b0e04-5009d4a4897so1567869e87.0 for ; Thu, 14 Sep 2023 05:10:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694693403; x=1695298203; 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=+qyUaH+PuHgEo8IDDqrm8woZ/iib9aFnWbmBioD4EHg=; b=d9LgnHSeoEoHOHQgO6WGF8x5GtiUYG4JMOHCp7WmGPBK+lugNS9knNvAcsW9jVSb60 HtXvSsnwWCzfE9sH5GA+G2XD1S/5ow7oVwvH40CSxcVc2/Egkavf64B3vGFMQr3S0VDK OTnpU4eX7zANSCQA19NsVBoP1jDMwB0y9PhFQvENhWMc3xlTcCztLxHm3uMn8hzJzlY+ 00IKgH5RUPHhlbNL9QtdyZAjIv834gM0bEH6lTRQQEvSpWaDWxzGeMSUDXX26jpKMcqz NgNQEiEz1qaZT9aQqfU1lG1AoSKzqt02reCvWl0Mag87YeaWWio2ikl696G6YA9vn4yk /JcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694693403; x=1695298203; 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=+qyUaH+PuHgEo8IDDqrm8woZ/iib9aFnWbmBioD4EHg=; b=KmZrYQ7Jvydb8Dz/GzubLum0BWfKjdUQ5n05GRZfRPI+cail1g1K9NRiAiSqzAXPLl yp0Yg2cQhiiWcqCfB93dme5PYj6+W3tHAsKa/dyQ+uIVtidDxgl8sZ4SjlHWPGVAZDrZ bOQnRObAQcfBCJXj5eKoNvDxmOx4UGp4id40e35iDA9C/R5DPm6EdO14ZKbPKtgaFCfT gCMpYNNmFlytSFA4cu1c9M6+F1WjTKs8uxj2F6hgfotgKLxNFzU2cKCIc0ELjxUS/d3b pQSNxeFjfsjvfOwU/5VWMH/QZ9Lyx7d/ifIrbXeURNqShgG/J/PafJLk0jenPxfa/Hfg wjag== X-Gm-Message-State: AOJu0YyHGsHkeQtx1TfMZ7BmJ+3PPkoh8VMHDXev0HDEdG71tnmhA2ZP 8x6AtU5BigqIW6NWaMyF6nm1gg7fAYI= X-Google-Smtp-Source: AGHT+IE8OwRlI033eVItX3darTAZ0qYLQkfhgEDAzjSudr/vKiO7IdzkvZFhgs5WlFV8cNknUj8MVA== X-Received: by 2002:a05:6512:530:b0:4fb:772a:af12 with SMTP id o16-20020a056512053000b004fb772aaf12mr4148338lfc.21.1694693403374; Thu, 14 Sep 2023 05:10:03 -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 t1-20020a19ad01000000b004fe32cb84fbsm251928lfc.302.2023.09.14.05.10.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 05:10:03 -0700 (PDT) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH: Move _history_modifiers call to _parameter Date: Thu, 14 Sep 2023 14:10:02 +0200 Message-Id: <20230914121002.10274-1-mikachu@gmail.com> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 52142 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: _parameters is used in many contexts, like assignments in command position, assignment after typeset, etc, where history modifiers are not valid. _brace_parameter already calls _history_modifiers explicitly so this seems more in line with that. --- Completion/Zsh/Context/_parameter | 5 +++++ Completion/Zsh/Type/_parameters | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Completion/Zsh/Context/_parameter b/Completion/Zsh/Context/_parameter index 7e7788535c..b08d665f58 100644 --- a/Completion/Zsh/Context/_parameter +++ b/Completion/Zsh/Context/_parameter @@ -1,3 +1,8 @@ #compdef -parameter- +if compset -P '*:'; then + _history_modifiers p + return +fi + _parameters -e diff --git a/Completion/Zsh/Type/_parameters b/Completion/Zsh/Type/_parameters index 7f6f33e0ee..7b7692a3c7 100644 --- a/Completion/Zsh/Type/_parameters +++ b/Completion/Zsh/Type/_parameters @@ -6,11 +6,6 @@ # 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 - _history_modifiers p - return -fi - local i pfilt local -i nm=$compstate[nmatches] local -a expl pattern=( -g \* ) normal described verbose faked fakes tmp -- 2.38.1