From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: James Thomas via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#72768: [PATCH] Keep local keymap out of vc-git-stash-get-at-point Date: Fri, 23 Aug 2024 10:53:40 +0530 Message-ID: <86le0nzuar.fsf@outlook.com> Reply-To: James Thomas Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2987"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) To: 72768@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Aug 23 07:24:40 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1shMms-0000bc-WC for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 23 Aug 2024 07:24:39 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1shMmY-00082k-JJ; Fri, 23 Aug 2024 01:24:18 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1shMmW-00082K-Au for bug-gnu-emacs@gnu.org; Fri, 23 Aug 2024 01:24:16 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1shMmW-0003lt-1I for bug-gnu-emacs@gnu.org; Fri, 23 Aug 2024 01:24:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=aRMvV6307Tiy0x3opfhsOuHUGC9Rg0eDhZ2E2pV+FBE=; b=SOuS+SfYAWpxuu6rOX5oFz8Dc6FFQRhlYWtc4dZNRBN8bKqUG7VCp5JeXgh7UXJjqi0/xicKiahcvKOEsU1iiidl5rgvW47sJC4YUBMkliMGQu6fMaxuqJeSckHIi4fMXsVo4WO/U4oEBQdlxhSRAiDafnRcyrWycaIJLEfloGWNUADPP7KScpKrf7dbM1L1biqrgfzTH1Qjwh8kmKweufv0ZVhQc2gCeSQBeXQFWToXS4PvNGMTDsEMXA7RlIPyknX1xt5t0N4fEDQ5hYZUQ60mPsI9GCOinVxpJ0vTLG6KE/hQK2tCtCRrEctna1Fv3fPlb5VBmMTG3xVPGlFRfw==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1shMnG-0003Nt-BB for bug-gnu-emacs@gnu.org; Fri, 23 Aug 2024 01:25:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: James Thomas Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 23 Aug 2024 05:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72768 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.172439070113002 (code B ref -1); Fri, 23 Aug 2024 05:25:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 23 Aug 2024 05:25:01 +0000 Original-Received: from localhost ([127.0.0.1]:38653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1shMnF-0003NY-Aq for submit@debbugs.gnu.org; Fri, 23 Aug 2024 01:25:01 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:34204) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1shMnC-0003NM-9G for submit@debbugs.gnu.org; Fri, 23 Aug 2024 01:24:59 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1shMmR-00081y-7R for bug-gnu-emacs@gnu.org; Fri, 23 Aug 2024 01:24:11 -0400 Original-Received: from mout.gmx.net ([212.227.15.19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1shMmO-0003lO-SQ for bug-gnu-emacs@gnu.org; Fri, 23 Aug 2024 01:24:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1724390644; x=1724995444; i=jimjoe@gmx.net; bh=aRMvV6307Tiy0x3opfhsOuHUGC9Rg0eDhZ2E2pV+FBE=; h=X-UI-Sender-Class:From:To:Subject:Date:Message-ID:MIME-Version: Content-Type:cc:content-transfer-encoding:content-type:date:from: message-id:mime-version:reply-to:subject:to; b=VzixCFsAcUCOoTK8XjWC8eN5COUTAuwYoIXNFrSsy/L8OOCyqi0q6BOCAarrkAor VxVwFvoDNMLHMhF8RBLoL9z+Sg2Q+vDRILf9Ij15hfmu8xqrUAz4EeHBBjAFwRI8K 8VTaNb1f449dBd7ZsUw7ZEZ05rPCG1pZO5hEtQd36S3fvcYlPuhItDKg+Az1HsKgv kdV6wD+k9AmHSC65csgBZRdfn+Nu1fqV8RF0USo01rberO/bWBtVnk5VZqGK7iTGh 1SLNAO4xJqlu70Ho1ece+yT5hVZpOHbVtu3fJdMFAmYXLcwNG35LUhREcBRU8ipJl xl5zxkc6I/1Cve76kw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from user-Inspiron-3493 ([117.216.30.156]) by mail.gmx.net (mrgmx005 [212.227.17.184]) with ESMTPSA (Nemesis) id 1MGQjH-1stkIj1MOT-00AQtX for ; Fri, 23 Aug 2024 07:24:04 +0200 X-Provags-ID: V03:K1:UdoPswu71brNQY182cP6HUqmplHZXoNrHQzBc1SgwmBM3sO8dbf D2auwUX8EdcdOaFORGWEymkDv3go+oYSVstLq7QHq/IX4VXX1tb5rTiZSnsjF+XfvNXIYr5 hH1puw4kLhPG9ZpkuoTD9mZmfPMYAKakAzz/4vN7IBhAbt6XKAfzO1WwS5fIU0DtyG93n9M S8SymZ1nw5SbiQPT2YZcA== UI-OutboundReport: notjunk:1;M01:P0:jxDRCh8YTJ0=;UcekHTmp6+Yq/6y8IvGi9+HgNms k5hAIOum8wAy84zX3ncrXaXPBjPrSV3r8aG4SbmHncKAAmyXwun6arp3ONO5VeMSnW/6dA53K lVRdp5r9l+ZTDx/GUlEDVn9Dy7S+vMIhDIQ9eFtuRXdT6fZYYbS33iLa5N/9gb2ADQIhj6qeh Q58FEWgSYy0h5fF55Tc/SP8jf5Q+UWepjDKeaFHIL+Md1GZzsAkjm+/oklI0l7mESHOqJwMWn gDyJPU9DPmw4w2NnJw/Bw5z2EvHzwmUDNsg7XwZzvHCuPAZZqx8/uwLuSxvgozGCIrug0TPLa 0aiOEhU2mXCYAp/5mM4PD9+Sye/XE8Dm0RPV0UGm2JqIVt8P9xFweCcZgLhdfovZRngfVSV1O 9aEYeX33RgbOnCkj+A2PVKVtF5wGsUrIpsR9uutDuHUJF9fyBp7hgx0kmZburet8CenDlLNys 0i1iLh0KDDqXo3TQPrdnOgif6zC1DDwmuUegeQLq8uSfJUtZbYePSIvgSOKxSfwU4RfzZXle0 vtgKOidKkqy6ucJm/qEB+HFP1PI0fSoJbNqFQkYvtPIsj3DH8JWKsp2/8kkiNDxAgjmZ5tNXr 4pyBl3QhEUoiojIksylDsjl0Pad4VV266m9858ZpsX0MQ8F4KHxlRr6ae4VDSG/jowr3Zgn7M 9X8APlA1qxhXYjXX1RkElwGzlTe+uJE/IeTcEliD9DkR+lfmOZGsvwk+2M0X0iGf5zBhwS4wo g9rkExjyeqWe88m6ljnDORebbsNwB0oeIUUkF4OvYoUi/wA27J65XRJHE4c0WqcrarQlFlIP Received-SPF: pass client-ip=212.227.15.19; envelope-from=jimjoe@gmx.net; helo=mout.gmx.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:290569 Archived-At: --=-=-= Content-Type: text/plain emacs -Q (define-key key-translation-map [?\C-j] (kbd "RET")) M-x vc-dir (select a git repo) (with point on a 'stash' entry) C-x v ! = C-j (fails) The following seems to work: --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Keep-local-keymap-out-of-vc-git-stash-get-at-point.patch Content-Description: [PATCH] Keep local keymap out of vc-git-stash-get-at-point Content-Transfer-Encoding: quoted-printable =46rom f4769888b8f7c86db58c449b7608604a1a629905 Mon Sep 17 00:00:00 2001 From: James Thomas Date: Fri, 23 Aug 2024 10:43:39 +0530 Subject: [PATCH] Keep local keymap out of vc-git-stash-get-at-point * lisp/vc/vc-git.el (vc-git-stash-get-at-point): Make the change. =2D-- lisp/vc/vc-git.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index e8257c5dbd0..1133424edeb 100644 =2D-- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -2135,7 +2135,7 @@ vc-git-stash-get-at-point (goto-char point) (beginning-of-line) (if (looking-at "^ +\\({[0-9]+}\\):") - (match-string 1) + (match-string-no-properties 1) (error "Cannot find stash at point")))) ;; vc-git-stash-delete-at-point must be called from a vc-dir buffer. =2D- 2.43.0 --=-=-=--