[Emacs-diffs] master 66f8070: Derive reftex-index-mode from special-mode

[Mark Oteiza]

branch: master
commit 66f80708a74d193c65a324caa80b115701da0859
Author: Mark Oteiza <address@hidden>
Commit: Mark Oteiza <address@hidden>

    Derive reftex-index-mode from special-mode
    
    * lisp/textmodes/reftex-index.el (reftex-index-mode-map): Flatten
    loop.  Remove digit keys and hyphen, as reftex-index-mode is derived
    from special-mode now.
    (reftex-index-mode): Derive from special-mode.
    (reftex-index-phrases-mode-map): Flatten loop. Fix erroneous docstring.
---
 lisp/textmodes/reftex-index.el |   92 ++++++++++++++++++----------------------
 1 file changed, 42 insertions(+), 50 deletions(-)

diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 0ed6f26..3cea589 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -287,40 +287,34 @@ will prompt for other arguments."
     (substitute-key-definition
      'previous-line 'reftex-index-previous map global-map)
 
-    (loop for x in
-          '(("n"    . reftex-index-next)
-            ("p"    . reftex-index-previous)
-            ("?"    . reftex-index-show-help)
-            (" "    . reftex-index-view-entry)
-            ("\C-m" . reftex-index-goto-entry-and-hide)
-            ("\C-i" . reftex-index-goto-entry)
-            ("\C-k" . reftex-index-kill)
-            ("r"    . reftex-index-rescan)
-            ("R"    . reftex-index-Rescan)
-            ("g"    . revert-buffer)
-            ("q"    . reftex-index-quit)
-            ("k"    . reftex-index-quit-and-kill)
-            ("f"    . reftex-index-toggle-follow)
-            ("s"    . reftex-index-switch-index-tag)
-            ("e"    . reftex-index-edit)
-            ("^"    . reftex-index-level-up)
-            ("_"    . reftex-index-level-down)
-            ("}"    . reftex-index-restrict-to-section)
-            ("{"    . reftex-index-widen)
-            (">"    . reftex-index-restriction-forward)
-            ("<"    . reftex-index-restriction-backward)
-            ("("    . reftex-index-toggle-range-beginning)
-            (")"    . reftex-index-toggle-range-end)
-            ("|"    . reftex-index-edit-attribute)
-            ("@"    . reftex-index-edit-visual)
-            ("*"    . reftex-index-edit-key)
-            ("\C-c=". reftex-index-goto-toc)
-            ("c"    . reftex-index-toggle-context))
-          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-index-next)
+    (define-key map "p" 'reftex-index-previous)
+    (define-key map "?" 'reftex-index-show-help)
+    (define-key map " " 'reftex-index-view-entry)
+    (define-key map "\C-m" 'reftex-index-goto-entry-and-hide)
+    (define-key map "\C-i" 'reftex-index-goto-entry)
+    (define-key map "\C-k" 'reftex-index-kill)
+    (define-key map "r" 'reftex-index-rescan)
+    (define-key map "R" 'reftex-index-Rescan)
+    (define-key map "g" 'revert-buffer)
+    (define-key map "q" 'reftex-index-quit)
+    (define-key map "k" 'reftex-index-quit-and-kill)
+    (define-key map "f" 'reftex-index-toggle-follow)
+    (define-key map "s" 'reftex-index-switch-index-tag)
+    (define-key map "e" 'reftex-index-edit)
+    (define-key map "^" 'reftex-index-level-up)
+    (define-key map "_" 'reftex-index-level-down)
+    (define-key map "}" 'reftex-index-restrict-to-section)
+    (define-key map "{" 'reftex-index-widen)
+    (define-key map ">" 'reftex-index-restriction-forward)
+    (define-key map "<" 'reftex-index-restriction-backward)
+    (define-key map "(" 'reftex-index-toggle-range-beginning)
+    (define-key map ")" 'reftex-index-toggle-range-end)
+    (define-key map "|" 'reftex-index-edit-attribute)
+    (define-key map "@" 'reftex-index-edit-visual)
+    (define-key map "*" 'reftex-index-edit-key)
+    (define-key map "\C-c=" 'reftex-index-goto-toc)
+    (define-key map "c" 'reftex-index-toggle-context)
 
     ;; The capital letters and the exclamation mark
     (loop for key across (concat "!" reftex-index-section-letters) do
@@ -392,7 +386,7 @@ will prompt for other arguments."
 (defvar reftex-index-restriction-indicator nil)
 (defvar reftex-index-restriction-data nil)
 
-(define-derived-mode reftex-index-mode fundamental-mode "RefTeX Index"
+(define-derived-mode reftex-index-mode special-mode "RefTeX Index"
   "Major mode for managing Index buffers for LaTeX files.
 This buffer was created with RefTeX.
 Press `?' for a summary of important key bindings, or check the menu.
@@ -1194,20 +1188,18 @@ This gets refreshed in every phrases command.")
 (defvar reftex-index-phrases-mode-map
   (let ((map (make-sparse-keymap)))
     ;; Keybindings and Menu for phrases buffer
-    (loop for x in
-          '(("\C-c\C-c" . reftex-index-phrases-save-and-return)
-            ("\C-c\C-x" . reftex-index-this-phrase)
-            ("\C-c\C-f" . reftex-index-next-phrase)
-            ("\C-c\C-r" . reftex-index-region-phrases)
-            ("\C-c\C-a" . reftex-index-all-phrases)
-            ("\C-c\C-d" . reftex-index-remaining-phrases)
-            ("\C-c\C-s" . reftex-index-sort-phrases)
-            ("\C-c\C-n" . reftex-index-new-phrase)
-            ("\C-c\C-m" . reftex-index-phrases-set-macro-key)
-            ("\C-c\C-i" . reftex-index-phrases-info)
-            ("\C-c\C-t" . reftex-index-find-next-conflict-phrase)
-            ("\C-i"     . self-insert-command))
-          do (define-key map (car x) (cdr x)))
+    (define-key map "\C-c\C-c" 'reftex-index-phrases-save-and-return)
+    (define-key map "\C-c\C-x" 'reftex-index-this-phrase)
+    (define-key map "\C-c\C-f" 'reftex-index-next-phrase)
+    (define-key map "\C-c\C-r" 'reftex-index-region-phrases)
+    (define-key map "\C-c\C-a" 'reftex-index-all-phrases)
+    (define-key map "\C-c\C-d" 'reftex-index-remaining-phrases)
+    (define-key map "\C-c\C-s" 'reftex-index-sort-phrases)
+    (define-key map "\C-c\C-n" 'reftex-index-new-phrase)
+    (define-key map "\C-c\C-m" 'reftex-index-phrases-set-macro-key)
+    (define-key map "\C-c\C-i" 'reftex-index-phrases-info)
+    (define-key map "\C-c\C-t" 'reftex-index-find-next-conflict-phrase)
+    (define-key map "\C-i" 'self-insert-command)
 
     (easy-menu-define reftex-index-phrases-menu map
       "Menu for Phrases buffer"
@@ -1255,7 +1247,7 @@ This gets refreshed in every phrases command.")
         ["Save and Return" reftex-index-phrases-save-and-return t]))
 
     map)
-  "Keymap used for *toc* buffer.")
+  "Keymap used for index phrases buffer.")
 (defvar reftex-index-phrases-syntax-table
   (let ((table (make-syntax-table)))
     (modify-syntax-entry ?\" "." table)