From owner-dev-commits-src-main@freebsd.org Wed Sep 22 08:27:54 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 C712D6AE3C8; Wed, 22 Sep 2021 08:27:54 +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 4HDryf510wz4ZpG; Wed, 22 Sep 2021 08:27:54 +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 8BD4B14642; Wed, 22 Sep 2021 08:27:54 +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 18M8Rsmm040182; Wed, 22 Sep 2021 08:27:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18M8RsVJ040181; Wed, 22 Sep 2021 08:27:54 GMT (envelope-from git) Date: Wed, 22 Sep 2021 08:27:54 GMT Message-Id: <202109220827.18M8RsVJ040181@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: 908b8e32f9de - main - sh: remove emacs improvements that are now defaults in libedit 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: 908b8e32f9deb55441fac75b8d1e3865e3d5302f 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: Wed, 22 Sep 2021 08:27:54 -0000 The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=908b8e32f9deb55441fac75b8d1e3865e3d5302f commit 908b8e32f9deb55441fac75b8d1e3865e3d5302f Author: Baptiste Daroussin AuthorDate: 2021-09-22 08:27:10 +0000 Commit: Baptiste Daroussin CommitDate: 2021-09-22 08:27:10 +0000 sh: remove emacs improvements that are now defaults in libedit --- bin/sh/histedit.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/sh/histedit.c b/bin/sh/histedit.c index 1a1e11e6f885..938df284a06c 100644 --- a/bin/sh/histedit.c +++ b/bin/sh/histedit.c @@ -203,8 +203,6 @@ bad: el_set(el, EL_EDITOR, "vi"); 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);