diff options
author | Jan Djärv <jan.h.d@swipnet.se> | 2013-10-20 11:26:15 +0200 |
---|---|---|
committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-10-20 11:26:15 +0200 |
commit | 5f161884b3788ce85590de8a6d3bc66f5cb58334 (patch) | |
tree | 6564e1d40eedd81dcaf6b6ee22316532410e9c5c /lisp/menu-bar.el | |
parent | aca5fcdc4c8f4d77d1408adec856356257cdaf19 (diff) | |
download | emacs-5f161884b3788ce85590de8a6d3bc66f5cb58334.tar.gz |
Make Info menu for GNUStep only for GUI.
* menu-bar.el: Put help-menu in menu-bar-final-items unconditionally.
Move Info menu item creation to ns-win.el.
* term/ns-win.el (ns-initialize-window-system): Rename Help to Info
in menu bar.
Diffstat (limited to 'lisp/menu-bar.el')
-rw-r--r-- | lisp/menu-bar.el | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el index 7c648df36fd..7ffc97b55de 100644 --- a/lisp/menu-bar.el +++ b/lisp/menu-bar.el @@ -40,11 +40,10 @@ (or (lookup-key global-map [menu-bar]) (define-key global-map [menu-bar] (make-sparse-keymap "menu-bar"))) -(if (not (featurep 'ns)) - ;; Force Help item to come last, after the major mode's own items. - ;; The symbol used to be called `help', but that gets confused with the - ;; help key. - (setq menu-bar-final-items '(help-menu))) +;; Force Help item to come last, after the major mode's own items. +;; The symbol used to be called `help', but that gets confused with the +;; help key. +(setq menu-bar-final-items '(help-menu)) ;; This definition is just to show what this looks like. ;; It gets modified in place when menu-bar-update-buffers is called. @@ -1731,15 +1730,8 @@ key, a click, or a menu-item")) (cons "Edit" menu-bar-edit-menu)) (bindings--define-key global-map [menu-bar file] (cons "File" menu-bar-file-menu)) - -;; Put "Help" menu at the end, or Info at the front. -;; If running under GNUstep, "Help" is moved and renamed "Info" (see below). -(if (and (featurep 'ns) - (not (eq system-type 'darwin))) - (bindings--define-key global-map [menu-bar help-menu] - (cons "Info" menu-bar-help-menu)) - (define-key-after global-map [menu-bar help-menu] - (cons (purecopy "Help") menu-bar-help-menu))) +(bindings--define-key global-map [menu-bar help-menu] + (cons (purecopy "Help") menu-bar-help-menu)) (defun menu-bar-menu-frame-live-and-visible-p () "Return non-nil if the menu frame is alive and visible. |