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, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 3459 invoked from network); 30 Jul 2022 01:09:44 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 30 Jul 2022 01:09:44 -0000 ARC-Seal: i=1; cv=none; a=rsa-sha256; d=zsh.org; s=rsa-20210803; t=1659143385; b=mujxUqG8Sl8PmUi8SwyHdiRkt2yvCXUt9VNPmCBuzSaH8knZGvo9SqzEVFJEyk4jB+xZLm4cRM zJiw4z+ryi8tHVIqY8hoyFkUOnIfeZZXwwCpGHcmp2dJwXkI5gi9YBsP4MFRVSNfyzo1JxKaAy FuJYqWrqyLAyawh5Y/cNFrIVWYcQOJ0Bf/elm4PcTn9czuS+jUAixgDYqBglqDCB7Q20F29HZB HumgVev4EoonvfRM+Bjm2wANsOpeCx8cpQdh7zWEi/rNe1dk4GCMhhppkYdc8wyC9v+NLxtSj3 S7ktVXcv7A2nl0WmjqKHo77I/YH6YCzr6LQ/j+H6CGf9fw==; ARC-Authentication-Results: i=1; zsh.org; iprev=pass (mail-oa1-f47.google.com) smtp.remote-ip=209.85.160.47; dkim=pass header.d=gmail.com header.s=20210112 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=1659143385; bh=o3jyYq/wFFjOJ/dFeJruipnP7JMnaw76m65QUDp8sVI=; h=List-Archive:List-Owner:List-Post:List-Unsubscribe:List-Subscribe:List-Help: List-Id:Sender:Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-ID:Date:Subject:Cc:To:From:DKIM-Signature: DKIM-Signature; b=NzsxGPKyJOGVHNOTAi3DqWTgRvoQbbjwzuNuaYz6GFpd2eMbMyIEnUeSuSy5e3FGNntu1h1dy/ qVdFvU2sT1YgUcM5mPjJXKbqHoi7lI/qEIwG4xB5wjFI9HQxo6zJ4/svET3MKriUYSv6oVcVUI IakpzkxXEwrbqQ9cNVK0UdQifOV21EXu9GhHUqAUvlDRw9vQx+KVYDrGHFIjTb2cK+GwxqpWvJ hbxjYCzCEUuIjjS9iEQ4nxCuBFIecGNy7i/kwH9fjSzN9IAlUpLu2DjGjLRwWmBAGcmxbTpzLG GLD+SDPxKGzKjgVflsJfYVT9j2nJH/WaqdiCQnYOPzg0gQ==; 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:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID; bh=qViN+aHyaXFsc6UKoGKFSpXp2sWVNkVZ2RwOblrxhJg=; b=a6hLkr6kvRQYOzVa4fk0SndAGZ QBPBx+kBpXUccezvRsg9RzRNASQXfB7tF309teOT1nSw7YZ/rn69hmCl8UQpw6yUdmuVFh52qvDXE xyqhxhuWQIdYA2vBNFFibMKzSqCetRUr7dWv0hM/P0lCzIBoz3/zTJIo/7qJ72m6IXC9g1m0h21Bm FpfUIhVUMTVtjanDdOxFPtDKsBWIa/3QGS2tcBZ+tGz9YLuegp6Uu2BYF5yfJm1pftboWQRFc2YFC 3aCJ2vDxe99FzBSVO4z06/SIWzQZrt6LgLj6/iFHu/Xdiq0oaM6mFH6GMf4A5ECqwB7xYXZDPsOfA 5uPA4ccg==; Received: from authenticated user by zero.zsh.org with local id 1oHazA-000MxD-Gk; Sat, 30 Jul 2022 01:09:44 +0000 Authentication-Results: zsh.org; iprev=pass (mail-oa1-f47.google.com) smtp.remote-ip=209.85.160.47; dkim=pass header.d=gmail.com header.s=20210112 header.a=rsa-sha256; dmarc=pass header.from=gmail.com; arc=none Received: from mail-oa1-f47.google.com ([209.85.160.47]:42967) by zero.zsh.org with esmtps (TLS1.3:TLS_AES_128_GCM_SHA256:128) id 1oHasv-000Kr5-9f; Sat, 30 Jul 2022 01:03:17 +0000 Received: by mail-oa1-f47.google.com with SMTP id 586e51a60fabf-f2a4c51c45so7644792fac.9 for ; Fri, 29 Jul 2022 18:03:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=qViN+aHyaXFsc6UKoGKFSpXp2sWVNkVZ2RwOblrxhJg=; b=LFFoNB6Lebcw/H/Apml7KAjfAJ9LFvDtzxgtK+/xYD6hZiFpDjEx9GBjI5qwX5grAA R7cM/ahZRPYaycwa9SbvJDvWrDmOynuy83eiG+7ebZNoUaSUnQzNtLjgzyeA6Usj3a5/ yxjNmZ0xUck9udEEz+ohIZ2H4rP8VBtYzQGyWRHd4+X8RTIMa3o9jiUFS77aCRD3SsfJ t5Aub8brqzyrYi40JkvuePOjAvlh77/soCcH5001f80Do30+8PUdtqWNoC3giWw11VLt IiCVtVPFcfXiohwsGTIKAEdzj5sgw17AhVYnNWjtXGDBPEeapmb1h2nVZ86T2lnk1rwA 46Tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=qViN+aHyaXFsc6UKoGKFSpXp2sWVNkVZ2RwOblrxhJg=; b=offGNAfySsknnHBi3XagjqVVLo6QMJogRlQxb8ltWlAm0yEJSIrmHrWn7BMZutCoI2 tbkxuBAESuiPIdVayt718uywfT494nCjV45pWoOn//jGDU8Oq1Tr/9Hp6jcojYgOQfXl woucNlkaSAeOUXRlrLhTso7X3mKP5eQiuvniMlqkrUI67qC5Hg2RR3dMRrYgtSqZ5O0D tvmcmZPj7mETws79pzrI7X1HWBU0kaWrsrIAZyX74xyd8/iDhJo8qubfM4/JaPKC7T9Q UfJ4W8V5XfpTF2WGrcbJ9tiNVcnYV3kexoe5usyqt1xlzfdBpsUvjFn7mnGCdNeomukl DkoQ== X-Gm-Message-State: AJIora+O9VyUIIT4U4W/94tUBUbhOxn3fTArO3K0bNt5l9/OJOfopGha +eANad0Ke5BeVCpto7H2BmexS0NSDhA= X-Google-Smtp-Source: AGRyM1sO2hORih4WDsMaSAOH7bljWMPkFloCzLTa3IWjC4Typ5rQykV4SCiGw0lvOLmlbIOCuJ9W1w== X-Received: by 2002:a05:6870:231d:b0:10b:7a0e:1be6 with SMTP id w29-20020a056870231d00b0010b7a0e1be6mr2807190oao.114.1659142996137; Fri, 29 Jul 2022 18:03:16 -0700 (PDT) Received: from localhost ([2806:2f0:4000:5c95:4ae7:daff:fe31:3285]) by smtp.gmail.com with ESMTPSA id n33-20020a056870972100b0010d5d5c3fc3sm1700577oaq.8.2022.07.29.18.03.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 18:03:15 -0700 (PDT) From: Felipe Contreras To: zsh-workers@zsh.org Cc: Oliver Kiddle , Felipe Contreras Subject: [PATCH 3/3] completion: make: fix whitespaces Date: Fri, 29 Jul 2022 20:03:10 -0500 Message-Id: <20220730010310.3383526-4-felipe.contreras@gmail.com> X-Mailer: git-send-email 2.37.1.225.gfa48d685d2 In-Reply-To: <20220730010310.3383526-1-felipe.contreras@gmail.com> References: <20220730010310.3383526-1-felipe.contreras@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Seq: 50437 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: Signed-off-by: Felipe Contreras --- Completion/Unix/Command/_make | 60 +++++++++++++++++------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/Completion/Unix/Command/_make b/Completion/Unix/Command/_make index 94747ae58..0fd0b3270 100644 --- a/Completion/Unix/Command/_make +++ b/Completion/Unix/Command/_make @@ -12,35 +12,35 @@ _make-expandVars() { case $rest[2] in ($) # '$$'. may not appear in target and variable's value - front=$front\$\$ - rest=${rest[3,-1]} - continue - ;; + front=$front\$\$ + rest=${rest[3,-1]} + continue + ;; (\() # Variable of the form $(foobar) - open='(' - close=')' - ;; + open='(' + close=')' + ;; ({) # ${foobar} - open='{' - close='}' - ;; + open='{' + close='}' + ;; ([[:alpha:]]) # $foobar. This is exactly $(f)oobar. - open='' - close='' - var=$rest[2] - ;; + open='' + close='' + var=$rest[2] + ;; (*) # bad parameter name - print -- $front$rest - return 1 - ;; + print -- $front$rest + return 1 + ;; esac if [[ -n $open ]]; then if [[ $rest == \$$open(#b)([[:alnum:]_]##)(#B)$close* ]]; then - var=$match + var=$match else # unmatched () or {}, or bad parameter name - print -- $front$rest - return 1 + print -- $front$rest + return 1 fi fi @@ -49,17 +49,17 @@ _make-expandVars() { val=${VAR_ARGS[$var]} else if [[ -n $opt_args[(I)(-e|--environment-overrides)] ]]; then - if [[ $parameters[$var] == scalar-export* ]]; then - val=${(P)var} - elif [[ -n ${VARIABLES[(i)$var]} ]]; then - val=${VARIABLES[$var]} - fi + if [[ $parameters[$var] == scalar-export* ]]; then + val=${(P)var} + elif [[ -n ${VARIABLES[(i)$var]} ]]; then + val=${VARIABLES[$var]} + fi else - if [[ -n ${VARIABLES[(i)$var]} ]]; then - val=${VARIABLES[$var]} - elif [[ $parameters[$var] == scalar-export* ]]; then - val=${(P)var} - fi + if [[ -n ${VARIABLES[(i)$var]} ]]; then + val=${VARIABLES[$var]} + elif [[ $parameters[$var] == scalar-export* ]]; then + val=${(P)var} + fi fi fi rest=${rest//\$$open$var$close/$val} -- 2.37.1.225.gfa48d685d2