* lisp/menu-bar.el (tty-menu-navigation-map): Reduce redundancy.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2066aef4ef46a026b399f81090b063178454ec09..cea0f7c4a59cde3607a844fd8b6f8dfa39d63a84 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * menu-bar.el (tty-menu-navigation-map): Reduce redundancy.
+
 2013-10-10  Andrei Chițu  <andrei.chitu1@gmail.com>  (tiny change)
 
        * calendar/icalendar.el (icalendar-import-file):

diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index ab2cb001ce6e17ea796993dd9870d9c18d89fa8e..375de582f991d79fb911b1b6027359764c3ab600 100644 (file)
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -2271,51 +2271,34 @@ If nil, the current mouse position is used."
 
     ;; The tty-menu-* are just symbols interpreted by term.c, they are
     ;; not real commands.
-    (substitute-key-definition 'keyboard-quit 'tty-menu-exit
-                              map (current-global-map))
-    (substitute-key-definition 'keyboard-escape-quit 'tty-menu-exit
-                              map (current-global-map))
+    (dolist (bind '((keyboard-quit . tty-menu-exit)
+                    (keyboard-escape-quit . tty-menu-exit)
+                    ;; The following two will need to be revised if we ever
+                    ;; support a right-to-left menu bar.
+                    (forward-char . tty-menu-next-menu)
+                    (backward-char . tty-menu-prev-menu)
+                    (right-char . tty-menu-next-menu)
+                    (left-char . tty-menu-prev-menu)
+                    (next-line . tty-menu-next-item)
+                    (previous-line . tty-menu-prev-item)
+                    (newline . tty-menu-select)
+                    (newline-and-indent . tty-menu-select)))
+      (substitute-key-definition (car bind) (cdr bind)
+                                 map (current-global-map)))
+
     ;; The bindings of menu-bar items are so that clicking on the menu
     ;; bar when a menu is already shown pops down that menu.
     ;; FIXME: we should iterate over all the visible menu-bar items,
     ;; instead of naming them explicitly here.  Also, this doesn't
     ;; include items added by current major mode.
-    (substitute-key-definition (lookup-key (current-global-map) [menu-bar file])
-                              'tty-menu-exit
-                              map (current-global-map))
-    (substitute-key-definition (lookup-key (current-global-map) [menu-bar edit])
-                              'tty-menu-exit
-                              map (current-global-map))
-    (substitute-key-definition (lookup-key (current-global-map) [menu-bar options])
-                              'tty-menu-exit
-                              map (current-global-map))
-    (substitute-key-definition (lookup-key (current-global-map) [menu-bar buffer])
-                              'tty-menu-exit
-                              map (current-global-map))
-    (substitute-key-definition (lookup-key (current-global-map) [menu-bar tools])
-                              'tty-menu-exit
-                              map (current-global-map))
-    (substitute-key-definition (lookup-key (current-global-map) [menu-bar help-menu])
-                              'tty-menu-exit
-                              map (current-global-map))
-    (substitute-key-definition 'forward-char 'tty-menu-next-menu
-                              map (current-global-map))
-    (substitute-key-definition 'backward-char 'tty-menu-prev-menu
-                              map (current-global-map))
-    ;; The following two will need to be revised if we ever support
-    ;; a right-to-left menu bar.
-    (substitute-key-definition 'right-char 'tty-menu-next-menu
-                              map (current-global-map))
-    (substitute-key-definition 'left-char 'tty-menu-prev-menu
-                              map (current-global-map))
-    (substitute-key-definition 'next-line 'tty-menu-next-item
-                              map (current-global-map))
-    (substitute-key-definition 'previous-line 'tty-menu-prev-item
-                              map (current-global-map))
-    (substitute-key-definition 'newline 'tty-menu-select
-                              map (current-global-map))
-    (substitute-key-definition 'newline-and-indent 'tty-menu-select
-                              map (current-global-map))
+    ;;
+    ;; FIXME: Why not (define-key map [menu-bat t] 'tty-menu-exit) ?  --Stef
+    (dolist (event '(file edit options buffer tools help-menu))
+      (substitute-key-definition
+       (lookup-key (current-global-map) (vector 'menu-bar event))
+       'tty-menu-exit
+       map (current-global-map)))
+
     (define-key map [?\C-r] 'tty-menu-select)
     (define-key map [?\C-j] 'tty-menu-select)
     (define-key map [return] 'tty-menu-select)

diff --git a/test/ChangeLog b/test/ChangeLog
index 7673e35e4bd9e64f07a3e0e01ba37c2b3a07e97a..2585561b840c2b27cba2df664381d70123a18ca9 100644 (file)
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -2,6 +2,10 @@
 
        * indent/ruby.rb: Fix a spurious change, add more failing examples.
 
+2013-10-07  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * indent/ruby.rb: Add a few more tests; adjust some indentation.
+
 2013-10-06  Dmitry Gutov  <dgutov@yandex.ru>
 
        * automated/ruby-mode-tests.el: Add tests for `ruby-forward-sexp'