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=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.4 Received: (qmail 14489 invoked from network); 8 Aug 2020 09:52:11 -0000 Received: from zero.zsh.org (2a02:898:31:0:48:4558:7a:7368) by inbox.vuxu.org with ESMTPUTF8; 8 Aug 2020 09:52:11 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=zsh.org; s=rsa-20200801; h=Sender:List-Archive:List-Owner:List-Post:List-Unsubscribe: List-Subscribe:List-Help:List-Id:Message-Id:Date:Subject:To:From:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References; bh=AwGaMe2OxdyEt4+ydhuueF+DnWxXU9brr+g6vmCGf4M=; b=c3y5ExjBF26+d3fUOY5k5B6T9s 0q6G9sNA1U8Fye8uiCTMcAD0r7B8HmYodzzlVi4LS50uK0tQuWYXLcTKo8sJuLirY8jJlbjlHjRkl Q8yr/AS63VRy8jrJRIOCpuYTpkJI8W6nEoOUySxY7woVAmZiGCzRfn7eYRSqoP7+goGfj9Ti3HQaC 8xU4c0/81qJS6oCMcc20rW0CAA+txdazW+a4P75ZJyJioTpmR2ADbOjjUtb3Usnsxh/MJbRVK5swF RC+7THSLLQhTFO7yBigSmK6B9YojthNkZ50eEe5AYVJ2G2906863w3FLCSMAaKDKzfpA27T6DrOte dCov/REw==; Received: from authenticated user by zero.zsh.org with local id 1k4LWM-0000As-R8; Sat, 08 Aug 2020 09:52:10 +0000 Authentication-Results: zsh.org; iprev=pass (mail-lj1-f175.google.com) smtp.remote-ip=209.85.208.175; dkim=pass header.d=gmail.com header.s=20161025 header.a=rsa-sha256 Received: from mail-lj1-f175.google.com ([209.85.208.175]:36522) by zero.zsh.org with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) id 1k4LW7-000Q0I-Hw; Sat, 08 Aug 2020 09:51:55 +0000 Received: by mail-lj1-f175.google.com with SMTP id t23so4691936ljc.3 for ; Sat, 08 Aug 2020 02:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=AwGaMe2OxdyEt4+ydhuueF+DnWxXU9brr+g6vmCGf4M=; b=pc2pFpD3EWiZ8SvHrjBUyQh3/pt1r2WIs71G6eCOG42XWTTWMCq13QbChUygJIJSEk NwFiNA5fM+4Ughii+0LTpX9X07hwbtLUl/r4tvqdTp9G6SryQHtJlbMom43IXG/0ZNZp 6NLLdlug4W1GFrMlWHVcaLKGkv7Kj+eQGdoAFmEWizufxz+MwkLIMfTQ27AlgcF0KY+G BesKMh9oOMhp4JTjQ0YcloDIh9hK/WJ0o9wqv8KStIWsQ9iz3GREAfYC+WQe0/hnBhuY PNQrwhojKpqFNkVnrTM6//+fBA4pttOLOfL/fqz0sXlDoYOxtocKrg+2HnCoAZCgloB5 eKDQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=AwGaMe2OxdyEt4+ydhuueF+DnWxXU9brr+g6vmCGf4M=; b=sYpvM1L5uz/ZZ5e1Rf4KP525abGZOYrtvlHEWvTBZFPIOb5BLXZk/KgXyWawFHxfWb st5A3SOFVv1kjIMbx8LM8HB9etwAaLEM916ka7FsENhq8C3OovW7n79xfkm5eEM9PjOl QVq2b5LH6S202Pw0tIQjZOHmCtzgtj4CCdF5fEj/Hh/tPCzAPc2ie0piWmnJ8U9H/f1h PYPa1kwUzHregcNRS5CFkdSOyBicU73WJlOf0zRHm1lAIExdKUKZfo0fvNfV9NgJJfv7 /uSrSqkEd5pFSzVSacZW0JPagWzgrUmwVSbicskbd40bd1Z1Wwbbytq1IgR18ohaRBN0 pOmQ== X-Gm-Message-State: AOAM532halO8UJpqhtJCL17PngO3R8rDWlYccvlfrB3C1lD7cjQPqifz Dl1AzN+2rHl/O0Wb0FZbqkNRm8nV X-Google-Smtp-Source: ABdhPJzh9em4Cl5/ASukQfpoO+W5oCOuFn0GpveuJzAFr2X8juhK/RTkb+hcX/Na3T97/9mmbNhC/A== X-Received: by 2002:a2e:9643:: with SMTP id z3mr8701347ljh.282.1596880314630; Sat, 08 Aug 2020 02:51:54 -0700 (PDT) Received: from localhost.localdomain (h-88-110.A230.priv.bahnhof.se. [212.85.88.110]) by smtp.gmail.com with ESMTPSA id x2sm4890833ljc.123.2020.08.08.02.51.53 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 08 Aug 2020 02:51:54 -0700 (PDT) From: Mikael Magnusson To: zsh-workers@zsh.org Subject: PATCH: edit-command-line: when possible, set $BUFFER directly Date: Sat, 8 Aug 2020 11:51:48 +0200 Message-Id: <20200808095148.21555-1-mikachu@gmail.com> X-Mailer: git-send-email 2.15.1 X-Zsh-Org-Should-ARC-Sign: true X-Seq: 47305 X-Loop: zsh-workers@zsh.org Errors-To: zsh-workers-owner@zsh.org Precedence: list Precedence: bulk X-no-archive: yes List-Id: List-Help: List-Subscribe: List-Unsubscribe: List-Post: List-Owner: List-Archive: Archived-At: Sender: Sympa Owner This avoids the send-break which is both visually unappealing and might break some use cases where the user wishes to wrap edit-command-line in another widget. --- See also: 23588 and 47295 Functions/Zle/edit-command-line | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/Functions/Zle/edit-command-line b/Functions/Zle/edit-command-line index 991775ea50..1103ca556c 100644 --- a/Functions/Zle/edit-command-line +++ b/Functions/Zle/edit-command-line @@ -7,6 +7,11 @@ # except that it will handle multi-line buffers properly. emulate -L zsh +local prebuffer +# see below comment for why this is needed +if (( ! ZLE_RECURSIVE )); then + prebuffer=$PREBUFFER +fi () { exec