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#47620: [PATCH] Allow complex key bindings in project-switch-project Date: Tue, 06 Apr 2021 16:57:31 +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="35200"; mail-complaints-to="usenet@ciao.gmane.io" To: 47620@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Tue Apr 06 16:58:11 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 1lTn9e-000912-TW for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 06 Apr 2021 16:58:11 +0200 Original-Received: from localhost ([::1]:54166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lTn9d-0005OT-JQ for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 06 Apr 2021 10:58:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50408) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTn9X-0005Nc-4X for bug-gnu-emacs@gnu.org; Tue, 06 Apr 2021 10:58:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:58128) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTn9W-0003U2-7X for bug-gnu-emacs@gnu.org; Tue, 06 Apr 2021 10:58:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lTn9W-0001jH-4A for bug-gnu-emacs@gnu.org; Tue, 06 Apr 2021 10:58: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, 06 Apr 2021 14:58:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47620 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.16177210676624 (code B ref -1); Tue, 06 Apr 2021 14:58:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 6 Apr 2021 14:57:47 +0000 Original-Received: from localhost ([127.0.0.1]:41441 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lTn9H-0001il-4x for submit@debbugs.gnu.org; Tue, 06 Apr 2021 10:57:47 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:55578) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lTn99-0001iY-AP for submit@debbugs.gnu.org; Tue, 06 Apr 2021 10:57:45 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50306) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lTn99-0005Hb-19 for bug-gnu-emacs@gnu.org; Tue, 06 Apr 2021 10:57:39 -0400 Original-Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]:35747) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lTn95-0003FW-RG for bug-gnu-emacs@gnu.org; Tue, 06 Apr 2021 10:57:38 -0400 Original-Received: by mail-ed1-x535.google.com with SMTP id p4so6684838edr.2 for ; Tue, 06 Apr 2021 07:57:34 -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=koBkEva34Ipie4IkL/p83ieHsPkM37lDEmRNOWAM5CE=; b=DwD2uFDAmOgadLVN0Q0Oc4dZbenew40ObxOYh/xfQ6N7yPuJA1i1ew3tF2mvctNXjC 4aB2L44DpLYLG9yuL/q/HnGopMXwHFs3ikPnJJFLjJHgi8An8L7il8fjfIzbO9eJ64GH o3L07kCEL78vDWRUh+h79fnWUfqMgHii+4hJxbWALkmArFNBwIKhA+lVLAhoj2RWvYqy 8taVZfz/PokMQe07DKeMvvm6GK8tptwMpZxGnblb36UKefQ/DyYicmBweUTTM4p+xkOf tEF7ePN1RneCTPwfyCGn6om5oXZI9K+ZYuSJzGPSWkhuy0IwyV6rfQsMEnf/u7ZV3thL dk/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=koBkEva34Ipie4IkL/p83ieHsPkM37lDEmRNOWAM5CE=; b=UP4ftrkrwFgfxAREwGytV6lNd0gCKm4n6VTM/AMunB9ntFQRcsDdr3q5NXAkNFianR Hh3lNCemPYoQre/E+ebX7O/1aSdHskAv0KJF1DOnSf4SO13tpCCSNV4RLKxmimYD8b6V ESoiaxamGQU3ID/keBjZAmcTjWIrX1V3zSMl1juKL5apy5cb76teL40/Hu0fdFFhcTv4 skQzoO1BXOCFPAP5/KZ3KcSCQTdnFSanOw9AVpLQIaLLiJ1RWdEDvNt0ACOKehc0ppq1 2m9pk7kt8kghZQmA5+/06LdcpohwvEd09jBxeghT7PcS5bjIZ4S8YioKJHSmHjUI93x8 dRtw== X-Gm-Message-State: AOAM533c9QkgAAmvQTQkRSIYFkY5/rAsITdRasQz2rdcbGZZUuZ4Aejx 6oUm0qifb28KOV3hy2RGhS6clJww49+W9w== X-Google-Smtp-Source: ABdhPJyPCdNfj/i8YAmBBa2vMFGMmZL/rbMax5m9nGXPQsQtmFScu6nW64tO7e/qOxLhKvHUMh8hVA== X-Received: by 2002:a05:6402:2786:: with SMTP id b6mr24971715ede.310.1617721052996; Tue, 06 Apr 2021 07:57:32 -0700 (PDT) Original-Received: from ZALANDO-31298 ([212.86.35.48]) by smtp.gmail.com with ESMTPSA id v8sm13956286edc.30.2021.04.06.07.57.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 Apr 2021 07:57:32 -0700 (PDT) Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=dario.gjorgjevski@gmail.com; helo=mail-ed1-x535.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:203633 Archived-At: --=-=-= Content-Type: text/plain Hi, project-switch-project currently only allows for single-char bindings to be used for its commands. Starting with emacs -Q, evaluate (require 'project) (define-key project-prefix-map (kbd "M-s g") 'rgrep) (add-to-list 'project-switch-commands '(rgrep "grep")) and then run project-switch-project (by default bound to C-x p p) and choose a project (hopefully you already have one available). You will see "[M-s g] grep" shown in the prompt, but you will not be able to choose it by typing M-s g. The patch attached bellow allows for any kind of key binding to be used. Admittedly, there may be a better way to do it since I did not spend much time looking into it. Please, share your thoughts. Best regards, Dario --=-=-= Content-Type: text/x-diff Content-Disposition: attachment; filename=0001-Allow-complex-key-bindings-in-project-switch-project.patch Content-Description: Allow complex key bindings in project-switch-project >From dbd256fced765e55bbe8a589874490a121546ae1 Mon Sep 17 00:00:00 2001 From: Dario Gjorgjevski Date: Tue, 6 Apr 2021 16:51:28 +0200 Subject: [PATCH] Allow complex key bindings in project-switch-project * lisp/progmodes/project.el (project-switch-project): Replace read-event with an overriding local map and read-key-sequence to allow for complex key bindings to be read. --- lisp/progmodes/project.el | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/lisp/progmodes/project.el b/lisp/progmodes/project.el index 910f70db03..84d02e25d9 100644 --- a/lisp/progmodes/project.el +++ b/lisp/progmodes/project.el @@ -1338,23 +1338,27 @@ made from `project-switch-commands'. When called in a program, it will use the project corresponding to directory DIR." (interactive (list (project-prompt-project-dir))) - (let ((commands-menu - (mapcar - (lambda (row) - (if (characterp (car row)) - ;; Deprecated format. - ;; XXX: Add a warning about it? - (reverse row) - row)) - project-switch-commands)) - command) + (let* ((commands-menu + (mapcar + (lambda (row) + (if (characterp (car row)) + ;; Deprecated format. + ;; XXX: Add a warning about it? + (reverse row) + row)) + project-switch-commands)) + (commands-map + (let ((temp-map (make-sparse-keymap))) + (set-keymap-parent temp-map project-prefix-map) + (dolist (row commands-menu temp-map) + (when-let ((cmd (nth 0 row)) + (keychar (nth 2 row))) + (define-key temp-map (vector keychar) cmd))))) + command) (while (not command) - (let ((choice (read-event (project--keymap-prompt)))) - (when (setq command - (or (car - (seq-find (lambda (row) (equal choice (nth 2 row))) - commands-menu)) - (lookup-key project-prefix-map (vector choice)))) + (let ((overriding-local-map commands-map) + (choice (read-key-sequence (project--keymap-prompt)))) + (when (setq command (lookup-key commands-map choice)) (unless (or project-switch-use-entire-map (assq command commands-menu)) ;; TODO: Add some hint to the prompt, like "key not -- 2.31.GIT --=-=-= Content-Type: text/plain -- $ keyserver=hkps://hkps.pool.sks-keyservers.net $ keyid=744A4F0B4F1C9371 $ gpg --keyserver $keyserver --search-keys $keyid --=-=-=--