2 files changed, 30 insertions, 14 deletions

diff --git a/etc/NEWS b/etc/NEWS
index e4c1ef4eae0..a2d61d5c561 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -50,6 +50,9 @@ The 'find-function', 'find-library', 'find-face-definition', and
 'find-variable' commands now allow retrieving previous input using the
 usual minibuffer history commands.  Each command has a separate history.
 
+---
+** New minor mode find-function-mode replaces the old find-function-setup-keys.
+
 ** Minibuffer and Completions
 
 +++
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index c1835feff18..c031ee427d4 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -26,7 +26,7 @@
 ;; The funniest thing about this is that I can't imagine why a package
 ;; so obviously useful as this hasn't been written before!!
 ;; ;;; find-func
-;; (find-function-setup-keys)
+;; (find-function-mode 1)
 ;;
 ;; or just:
 ;;
@@ -805,21 +805,34 @@ See `find-function-on-key'."
     (when (and symb (not (equal symb 0)))
       (find-variable-other-window symb))))
 
+(defvar-keymap find-function-mode-map
+  "C-x F"   #'find-function
+  "C-x 4 F" #'find-function-other-window
+  "C-x 5 F" #'find-function-other-frame
+
+  "C-x K"   #'find-function-on-key
+  "C-x 4 K" #'find-function-on-key-other-window
+  "C-x 5 K" #'find-function-on-key-other-frame
+
+  "C-x V"   #'find-variable
+  "C-x 4 V" #'find-variable-other-window
+  "C-x 5 V" #'find-variable-other-frame
+
+  "C-x L"   #'find-library
+  "C-x 4 L" #'find-library-other-window
+  "C-x 5 L" #'find-library-other-frame)
+
+;;;###autoload
+(define-minor-mode find-function-mode
+  "Enable some key bindings for the `find-function' family of functions."
+  :global t :lighter nil   ; compat. with old `find-function-setup-keys'
+  :group 'find-function :version "31.1")
+
 ;;;###autoload
 (defun find-function-setup-keys ()
-  "Define some key bindings for the `find-function' family of functions."
-  (define-key ctl-x-map "F" 'find-function)
-  (define-key ctl-x-4-map "F" 'find-function-other-window)
-  (define-key ctl-x-5-map "F" 'find-function-other-frame)
-  (define-key ctl-x-map "K" 'find-function-on-key)
-  (define-key ctl-x-4-map "K" 'find-function-on-key-other-window)
-  (define-key ctl-x-5-map "K" 'find-function-on-key-other-frame)
-  (define-key ctl-x-map "V" 'find-variable)
-  (define-key ctl-x-4-map "V" 'find-variable-other-window)
-  (define-key ctl-x-5-map "V" 'find-variable-other-frame)
-  (define-key ctl-x-map "L" 'find-library)
-  (define-key ctl-x-4-map "L" 'find-library-other-window)
-  (define-key ctl-x-5-map "L" 'find-library-other-frame))
+  "Turn on `find-function-mode', which see."
+  (find-function-mode 1))
+(make-obsolete 'find-function-setup-keys 'find-function-mode "31.1")
 
 (provide 'find-func)