From 0713b2d8ad3e75339c573354212602e661d314af Mon Sep 17 00:00:00 2001 From: Noam Postavsky Date: Sun, 5 May 2019 09:13:19 -0400 Subject: [PATCH] Use remapping in ffap-bindings (Bug#35577) * lisp/ffap.el (ffap-bindings): Bind to the [remap COMMAND] instead of hardcoding the default keybindings. This better adapts better if non-default are used. And lets the original keybindings be remembered, so that, e.g., \[find-file] in docstrings will still be substituted with C-x C-f (even though that binding has been remapped to find-file-at-point. --- lisp/ffap.el | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lisp/ffap.el b/lisp/ffap.el index 36e37e95fe..bcb5efef54 100644 --- a/lisp/ffap.el +++ b/lisp/ffap.el @@ -2042,19 +2042,19 @@ (defvar ffap-bindings '((global-set-key [S-mouse-3] 'ffap-at-mouse) (global-set-key [C-S-mouse-3] 'ffap-menu) - (global-set-key "\C-x\C-f" 'find-file-at-point) - (global-set-key "\C-x\C-r" 'ffap-read-only) - (global-set-key "\C-x\C-v" 'ffap-alternate-file) - - (global-set-key "\C-x4f" 'ffap-other-window) - (global-set-key "\C-x5f" 'ffap-other-frame) - (global-set-key "\C-x4r" 'ffap-read-only-other-window) - (global-set-key "\C-x5r" 'ffap-read-only-other-frame) - - (global-set-key "\C-xd" 'dired-at-point) - (global-set-key "\C-x4d" 'ffap-dired-other-window) - (global-set-key "\C-x5d" 'ffap-dired-other-frame) - (global-set-key "\C-x\C-d" 'ffap-list-directory) + (global-set-key [remap find-file] 'find-file-at-point) + (global-set-key [remap find-file-read-only] 'ffap-read-only) + (global-set-key [remap find-alternate-file] 'ffap-alternate-file) + + (global-set-key [remap find-file-other-window] 'ffap-other-window) + (global-set-key [remap find-file-other-frame] 'ffap-other-frame) + (global-set-key [remap find-file-read-only-other-window] 'ffap-read-only-other-window) + (global-set-key [remap find-file-read-only-other-frame] 'ffap-read-only-other-frame) + + (global-set-key [remap dired] 'dired-at-point) + (global-set-key [remap dired-other-window] 'ffap-dired-other-window) + (global-set-key [remap dired-other-frame] 'ffap-dired-other-frame) + (global-set-key [remap list-directory] 'ffap-list-directory) (add-hook 'gnus-summary-mode-hook 'ffap-gnus-hook) (add-hook 'gnus-article-mode-hook 'ffap-gnus-hook) -- 2.11.0