bug#72768: [PATCH] Keep local keymap out of vc-git-stash-get-at-point

bug#72768: [PATCH] Keep local keymap out of vc-git-stash-get-at-point

[James Thomas via Bug reports for GNU Emacs, the Swiss army knife of text editors]

[-- Attachment #1: Type: text/plain, Size: 179 bytes --]

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:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: [PATCH] Keep local keymap out of vc-git-stash-get-at-point --]
[-- Type: text/x-patch, Size: 842 bytes --]

From f4769888b8f7c86db58c449b7608604a1a629905 Mon Sep 17 00:00:00 2001
From: James Thomas <jimjoe@gmx.net>
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.
---
 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
--- 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.
--
2.43.0

bug#72768: [PATCH] Keep local keymap out of vc-git-stash-get-at-point

[James Thomas via Bug reports for GNU Emacs, the Swiss army knife of text editors]

James Thomas wrote:

> 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)

Of course, if a 'stash' doesn't exist, it may be created, so that the
steps are:

emacs -Q
C-x C-f (open a git-tracked file, make changes), C-x C-s (and save it)
C-x p v (select the above repo)
z c (create stash)
M-: (define-key key-translation-map  [?\C-j] (kbd "RET"))
(with point on the new 'stash' entry) C-x v ! = C-j (fails)

--

bug#72768: [PATCH] Keep local keymap out of vc-git-stash-get-at-point

[Eli Zaretskii]

> Date: Tue, 27 Aug 2024 03:37:54 +0530
> From:  James Thomas via "Bug reports for GNU Emacs,
>  the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
> 
> James Thomas wrote:
> 
> > 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)
> 
> Of course, if a 'stash' doesn't exist, it may be created, so that the
> steps are:
> 
> emacs -Q
> C-x C-f (open a git-tracked file, make changes), C-x C-s (and save it)
> C-x p v (select the above repo)
> z c (create stash)
> M-: (define-key key-translation-map  [?\C-j] (kbd "RET"))
> (with point on the new 'stash' entry) C-x v ! = C-j (fails)

Dmitry, any comments or suggestions?

bug#72768: [PATCH] Keep local keymap out of vc-git-stash-get-at-point

[Dmitry Gutov]

Version: 31.1

On 07/09/2024 10:33, Eli Zaretskii wrote:
>> Date: Tue, 27 Aug 2024 03:37:54 +0530
>> From:  James Thomas via "Bug reports for GNU Emacs,
>>   the Swiss army knife of text editors"<bug-gnu-emacs@gnu.org>
>>
>> James Thomas wrote:
>>
>>> 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)
>> Of course, if a 'stash' doesn't exist, it may be created, so that the
>> steps are:
>>
>> emacs -Q
>> C-x C-f (open a git-tracked file, make changes), C-x C-s (and save it)
>> C-x p v (select the above repo)
>> z c (create stash)
>> M-: (define-key key-translation-map  [?\C-j] (kbd "RET"))
>> (with point on the new 'stash' entry) C-x v ! = C-j (fails)
> Dmitry, any comments or suggestions?

Makes sense. Pushed to master, thanks!