Clean up reftex-toc-mode-map

* lisp/textmodes/reftex-toc.el: Remove cl.
(reftex-toc-mode-map): Flatten loop.  Remove mapping digit keys and
hyphen, as reftex-toc-mode is derived from special-mode nowadays.

1 files changed, 28 insertions, 36 deletions

diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 5df4178b966..a4c8da07501 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -24,7 +24,6 @@
 
 ;;; Code:
 
-(eval-when-compile (require 'cl))
 (provide 'reftex-toc)
 (require 'reftex)
 ;;;
@@ -42,41 +41,34 @@
     (substitute-key-definition
      'previous-line 'reftex-toc-previous map global-map)
 
-    (loop for x in
-          '(("n"        . reftex-toc-next)
-            ("p"        . reftex-toc-previous)
-            ("?"        . reftex-toc-show-help)
-            (" "        . reftex-toc-view-line)
-            ("\C-m"     . reftex-toc-goto-line-and-hide)
-            ("\C-i"     . reftex-toc-goto-line)
-            ("\C-c>"    . reftex-toc-display-index)
-            ("r"        . reftex-toc-rescan)
-            ("R"        . reftex-toc-Rescan)
-            ("g"        . revert-buffer)
-            ("q"        . reftex-toc-quit) ;
-            ("k"        . reftex-toc-quit-and-kill)
-            ("f"        . reftex-toc-toggle-follow) ;
-            ("a"        . reftex-toggle-auto-toc-recenter)
-            ("d"        . reftex-toc-toggle-dedicated-frame)
-            ("F"        . reftex-toc-toggle-file-boundary)
-            ("i"        . reftex-toc-toggle-index)
-            ("l"        . reftex-toc-toggle-labels)
-            ("t"        . reftex-toc-max-level)
-            ("c"        . reftex-toc-toggle-context)
-            ;; ("%"        . reftex-toc-toggle-commented)
-            ("\M-%"     . reftex-toc-rename-label)
-            ("x"        . reftex-toc-external)
-            ("z"        . reftex-toc-jump)
-            ("."        . reftex-toc-show-calling-point)
-            ("\C-c\C-n" . reftex-toc-next-heading)
-            ("\C-c\C-p" . reftex-toc-previous-heading)
-            (">"        . reftex-toc-demote)
-            ("<"        . reftex-toc-promote))
-          do (define-key map (car x) (cdr x)))
-
-    (loop for key across "0123456789" do
-          (define-key map (vector (list key)) 'digit-argument))
-    (define-key map "-" 'negative-argument)
+    (define-key map "n" 'reftex-toc-next)
+    (define-key map "p" 'reftex-toc-previous)
+    (define-key map "?" 'reftex-toc-show-help)
+    (define-key map " " 'reftex-toc-view-line)
+    (define-key map "\C-m" 'reftex-toc-goto-line-and-hide)
+    (define-key map "\C-i" 'reftex-toc-goto-line)
+    (define-key map "\C-c>" 'reftex-toc-display-index)
+    (define-key map "r" 'reftex-toc-rescan)
+    (define-key map "R" 'reftex-toc-Rescan)
+    (define-key map "q" 'reftex-toc-quit) ;
+    (define-key map "k" 'reftex-toc-quit-and-kill)
+    (define-key map "f" 'reftex-toc-toggle-follow) ;
+    (define-key map "a" 'reftex-toggle-auto-toc-recenter)
+    (define-key map "d" 'reftex-toc-toggle-dedicated-frame)
+    (define-key map "F" 'reftex-toc-toggle-file-boundary)
+    (define-key map "i" 'reftex-toc-toggle-index)
+    (define-key map "l" 'reftex-toc-toggle-labels)
+    (define-key map "t" 'reftex-toc-max-level)
+    (define-key map "c" 'reftex-toc-toggle-context)
+    ;; (define-key map "%" 'reftex-toc-toggle-commented)
+    (define-key map "\M-%" 'reftex-toc-rename-label)
+    (define-key map "x" 'reftex-toc-external)
+    (define-key map "z" 'reftex-toc-jump)
+    (define-key map "." 'reftex-toc-show-calling-point)
+    (define-key map "\C-c\C-n" 'reftex-toc-next-heading)
+    (define-key map "\C-c\C-p" 'reftex-toc-previous-heading)
+    (define-key map ">" 'reftex-toc-demote)
+    (define-key map "<" 'reftex-toc-promote)
 
     (easy-menu-define
       reftex-toc-menu map