all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Dario Gjorgjevski <dario.gjorgjevski@gmail.com>
To: 47501@debbugs.gnu.org
Subject: bug#47501: [PATCH] Do not search the global keymap in project--keymap-prompt
Date: Tue, 30 Mar 2021 19:02:34 +0200	[thread overview]
Message-ID: <fv2zojr1jwtw0l.fsf@gmail.com> (raw)

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

Hi,

project--keymap-prompt searches project-prefix-map *plus* the global
keymap when constructing the prompt for project-switch-command.  This
can result in weird behavior; for example,

    (global-set-key (kbd "M-s r") 'rgrep)
    (require 'project)
    (define-key project-prefix-map (kbd "<f5>") 'rgrep)
    (push '(rgrep "rgrep") project-switch-commands)

might (or will?) cause project-switch-project to display "[M-s r] rgrep"
instead of the expected "[<f5>] rgrep".

The attached patch fixes the issue as per the documentation of
`where-is-internal'.

Best regards,
Dario


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Do not search the global keymap in project--keymap-prompt --]
[-- Type: text/x-diff, Size: 1088 bytes --]

From 6e63d66b85d702abc72a32bcbb4d4f00fd6e2a21 Mon Sep 17 00:00:00 2001
From: Dario Gjorgjevski <dario.gjorgjevski+git@gmail.com>
Date: Tue, 30 Mar 2021 18:50:23 +0200
Subject: [PATCH] Do not search the global keymap in project--keymap-prompt

* lisp/progmodes/project.el: (project--keymap-prompt) Pass
project--keymap-prompt as a list to where-is-internal so that the
global keymap is not searched at all.
---
 lisp/progmodes/project.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el
index 4101962..e0d5412 100644
--- a/lisp/progmodes/project.el
+++ b/lisp/progmodes/project.el
@@ -1321,7 +1321,7 @@ are legal even if they aren't listed in the dispatch menu."
                key tmp)))
      (let ((key (if key
                     (vector key)
-                  (where-is-internal cmd project-prefix-map t))))
+                  (where-is-internal cmd (list project-prefix-map) t))))
        (format "[%s] %s"
                (propertize (key-description key) 'face 'bold)
                label)))
-- 
2.31.0


[-- Attachment #3: Type: text/plain, Size: 128 bytes --]


-- 
$ keyserver=hkps://hkps.pool.sks-keyservers.net
$ keyid=744A4F0B4F1C9371
$ gpg --keyserver $keyserver --search-keys $keyid

             reply	other threads:[~2021-03-30 17:02 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-30 17:02 Dario Gjorgjevski [this message]
2021-04-05 16:15 ` bug#47501: [PATCH] Do not search the global keymap in project--keymap-prompt Lars Ingebrigtsen

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=fv2zojr1jwtw0l.fsf@gmail.com \
    --to=dario.gjorgjevski@gmail.com \
    --cc=47501@debbugs.gnu.org \
    /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.