From owner-dev-commits-src-main@freebsd.org Sat Aug 28 14:12:00 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DADD5674FF2; Sat, 28 Aug 2021 14:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GxdnD5SwQz4qsn; Sat, 28 Aug 2021 14:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A13231875C; Sat, 28 Aug 2021 14:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 17SEC0kJ008303; Sat, 28 Aug 2021 14:12:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 17SEC01m008302; Sat, 28 Aug 2021 14:12:00 GMT (envelope-from git) Date: Sat, 28 Aug 2021 14:12:00 GMT Message-Id: <202108281412.17SEC01m008302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 3ae61b972b04 - main - sh: improve emacs mode MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3ae61b972b042f2ea35d1670bd2ce5820400d27b Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 28 Aug 2021 14:12:01 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=3ae61b972b042f2ea35d1670bd2ce5820400d27b commit 3ae61b972b042f2ea35d1670bd2ce5820400d27b Author: Baptiste Daroussin AuthorDate: 2021-08-28 12:59:53 +0000 Commit: Baptiste Daroussin CommitDate: 2021-08-28 14:11:57 +0000 sh: improve emacs mode in emacs mode ^W should delete the previous word by default Note that upstreaming this change directly into libedit is in process. Reported by: manu Reviewed by: jills, pstef, manu Differential Revision: https://reviews.freebsd.org/D29493 --- bin/sh/histedit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index bd82016c33cb..b680a99c4ace 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -204,6 +204,7 @@ bad: else if (Eflag) { el_set(el, EL_EDITOR, "emacs"); el_set(el, EL_BIND, "^R", "em-inc-search-prev", NULL); + el_set(el, EL_BIND, "^W", "ed-delete-prev-word", NULL); } el_set(el, EL_BIND, "^I", "sh-complete", NULL); el_source(el, NULL);