From de1c98ef0ca62838da26e3f7f1f7d89ae923b084 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 1 Aug 2022 18:15:51 +0200 Subject: Prefer command remapping to substitute-key-definition * lisp/textmodes/reftex-index.el (reftex-index-mode-map): * lisp/textmodes/reftex-sel.el (reftex-select-shared-map): * lisp/textmodes/reftex-toc.el (reftex-toc-mode-map): Prefer command remapping to 'substitute-key-definition'. --- lisp/textmodes/reftex-index.el | 6 ++---- lisp/textmodes/reftex-sel.el | 12 ++++-------- lisp/textmodes/reftex-toc.el | 6 ++---- 3 files changed, 8 insertions(+), 16 deletions(-) (limited to 'lisp/textmodes') diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el index b517cc16634..075ad666b3d 100644 --- a/lisp/textmodes/reftex-index.el +++ b/lisp/textmodes/reftex-index.el @@ -275,10 +275,8 @@ will prompt for other arguments." (define-key map [(mouse-2)] #'reftex-index-mouse-goto-line-and-hide) (define-key map [follow-link] 'mouse-face) - (substitute-key-definition - #'next-line #'reftex-index-next map global-map) - (substitute-key-definition - #'previous-line #'reftex-index-previous map global-map) + (define-key map [remap next-line] #'reftex-index-next) + (define-key map [remap previous-line] #'reftex-index-previous) (define-key map "n" #'reftex-index-next) (define-key map "p" #'reftex-index-previous) diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el index 5942801a8a9..80c01948e5a 100644 --- a/lisp/textmodes/reftex-sel.el +++ b/lisp/textmodes/reftex-sel.el @@ -33,14 +33,10 @@ (defvar reftex-select-shared-map (let ((map (make-sparse-keymap))) (set-keymap-parent map special-mode-map) - (substitute-key-definition - #'next-line #'reftex-select-next map global-map) - (substitute-key-definition - #'previous-line #'reftex-select-previous map global-map) - (substitute-key-definition - #'keyboard-quit #'reftex-select-keyboard-quit map global-map) - (substitute-key-definition - #'newline #'reftex-select-accept map global-map) + (define-key map [remap next-line] #'reftex-select-next) + (define-key map [remap previous-line] #'reftex-select-previous) + (define-key map [remap keyboard-quit] #'reftex-select-keyboard-quit) + (define-key map [remap newline] #'reftex-select-accept) (define-key map " " #'reftex-select-callback) (define-key map "n" #'reftex-select-next) diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el index 5599eaee024..a7f3a9452a6 100644 --- a/lisp/textmodes/reftex-toc.el +++ b/lisp/textmodes/reftex-toc.el @@ -34,10 +34,8 @@ (define-key map [(mouse-2)] #'reftex-toc-mouse-goto-line-and-hide) (define-key map [follow-link] 'mouse-face) - (substitute-key-definition - 'next-line 'reftex-toc-next map global-map) - (substitute-key-definition - 'previous-line 'reftex-toc-previous map global-map) + (define-key map [remap next-line] #'reftex-toc-next) + (define-key map [remap previous-line] #'reftex-toc-previous) (define-key map "n" #'reftex-toc-next) (define-key map "p" #'reftex-toc-previous) -- cgit v1.2.3