From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dario Gjorgjevski Newsgroups: gmane.emacs.bugs Subject: bug#47501: [PATCH] Do not search the global keymap in project--keymap-prompt Date: Tue, 30 Mar 2021 19:02:34 +0200 Message-ID: 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="27737"; mail-complaints-to="usenet@ciao.gmane.io" To: 47501@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Mar 30 19:03:26 2021 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 1lRHm2-00077X-Ck for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 30 Mar 2021 19:03:26 +0200 Original-Received: from localhost ([::1]:33416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lRHm1-00022r-Cr for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 30 Mar 2021 13:03:25 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33376) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRHll-00022P-1S for bug-gnu-emacs@gnu.org; Tue, 30 Mar 2021 13:03:09 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:41203) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRHle-0005Mr-7L for bug-gnu-emacs@gnu.org; Tue, 30 Mar 2021 13:03:05 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lRHle-0007O8-1j for bug-gnu-emacs@gnu.org; Tue, 30 Mar 2021 13:03:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Dario Gjorgjevski Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 30 Mar 2021 17:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47501 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.161712376628374 (code B ref -1); Tue, 30 Mar 2021 17:03:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 30 Mar 2021 17:02:46 +0000 Original-Received: from localhost ([127.0.0.1]:52749 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRHlO-0007NZ-6H for submit@debbugs.gnu.org; Tue, 30 Mar 2021 13:02:46 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:34386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lRHlI-0007NN-AR for submit@debbugs.gnu.org; Tue, 30 Mar 2021 13:02:44 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:33282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRHlI-0001mM-2o for bug-gnu-emacs@gnu.org; Tue, 30 Mar 2021 13:02:40 -0400 Original-Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:43635) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lRHlG-0005CH-DM for bug-gnu-emacs@gnu.org; Tue, 30 Mar 2021 13:02:39 -0400 Original-Received: by mail-wm1-x32a.google.com with SMTP id u5-20020a7bcb050000b029010e9316b9d5so8809787wmj.2 for ; Tue, 30 Mar 2021 10:02:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version; bh=WTexbsaQUmwHmFUTbiBKGoaEf4nJ/F2LOU2SkItRSw8=; b=Ywx3DpBcyBMLMQd5ERmaij0ha9pyXa1fmTgdyIaTAcsn/TyL6SoUyYaNDIghQToo7s e0qCC1a2q2nHrGd0upf3cV+LJxTW4EUThbk6vOJXIe/oOON3Pse58eVQ7YEba/Dg9hzT mPBT+V7+p/LGwQ20vBfMGMO4JJQnCLjjiZUfnmSSbWGMPZ9/ANR6Swqmt5/nFnBePSxV 8MCLGUl/Ssf6Y37RxJeQnzV2JskcOClvi5uARMmUpgUe8a5BIczWIpySywAne7Q8jZ5/ coS3+hZqnrLFklYFQZlZEL2NfYXDypxujwOyRWBf//oQyWcw9CyEu5gu5pr/PaNJO6de H2/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version; bh=WTexbsaQUmwHmFUTbiBKGoaEf4nJ/F2LOU2SkItRSw8=; b=VchvTuB0YRSDxZKcl2/YP9qu7Rtcb8wZ3fIvv1Xs+ldFOwerYPX9jq965Jh2CB6zfv inbSsWXfECCAzNfA516haLTspXrDv+sG7Q54+eq196GU90lk5I4S0sKukPnMsexhwmO1 WY37+xBBapVndsCcvr/xxanh/JhAhvnvQoWStNO3oK/aDFny6tmd/5pBRpdCwqds6FY5 PZQc7f8KhiSqiv9zz0uoLi2hDvcHuBLFM7vpEjMrbMIDo7CnWzN1C7tKR4Ag97CjIHUD 4ICtbzYLyO1iDIlwf2WWDtqY+FgXYboQCP70OBGIroi6frGNAMTDDGhjMFOKKMU/9UW9 mIzg== X-Gm-Message-State: AOAM533LVz7SHjSceKy+u8CDkxwhAbxPSBU40ndk5uU9PIIFhOgMda7J ln88H8IaTxCCWSoqQUIoJiToxwg747c= X-Google-Smtp-Source: ABdhPJyO4Bxf83g95/kKBzjQBtoOGkH0s81/xrG7VNFoXuDxfpHp/f1AduwQyzNe6ROL1ri/C/cCrQ== X-Received: by 2002:a1c:ddc6:: with SMTP id u189mr5099702wmg.171.1617123756080; Tue, 30 Mar 2021 10:02:36 -0700 (PDT) Original-Received: from ZALANDO-31298 (p200300e9772701655d2ddb1e554abc2b.dip0.t-ipconnect.de. [2003:e9:7727:165:5d2d:db1e:554a:bc2b]) by smtp.gmail.com with ESMTPSA id m132sm4623890wmf.45.2021.03.30.10.02.35 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 30 Mar 2021 10:02:35 -0700 (PDT) Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=dario.gjorgjevski@gmail.com; helo=mail-wm1-x32a.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 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" Xref: news.gmane.io gmane.emacs.bugs:203323 Archived-At: --=-=-= Content-Type: text/plain 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 "") 'rgrep) (push '(rgrep "rgrep") project-switch-commands) might (or will?) cause project-switch-project to display "[M-s r] rgrep" instead of the expected "[] rgrep". The attached patch fixes the issue as per the documentation of `where-is-internal'. Best regards, Dario --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Do-not-search-the-global-keymap-in-project-keymap-pr.patch Content-Description: Do not search the global keymap in project--keymap-prompt >From 6e63d66b85d702abc72a32bcbb4d4f00fd6e2a21 Mon Sep 17 00:00:00 2001 From: Dario Gjorgjevski 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 --=-=-= Content-Type: text/plain -- $ keyserver=hkps://hkps.pool.sks-keyservers.net $ keyid=744A4F0B4F1C9371 $ gpg --keyserver $keyserver --search-keys $keyid --=-=-=--