all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: James Thomas via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: 72768@debbugs.gnu.org
Subject: bug#72768: [PATCH] Keep local keymap out of vc-git-stash-get-at-point
Date: Fri, 23 Aug 2024 10:53:40 +0530	[thread overview]
Message-ID: <86le0nzuar.fsf@outlook.com> (raw)

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


             reply	other threads:[~2024-08-23  5:23 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-23  5:23 James Thomas via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]
2024-08-26 22:07 ` 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
2024-09-07  7:33   ` Eli Zaretskii
2024-09-08  2:11     ` Dmitry Gutov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=86le0nzuar.fsf@outlook.com \
    --to=bug-gnu-emacs@gnu.org \
    --cc=72768@debbugs.gnu.org \
    --cc=jimjoe@gmx.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.