andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make Info menu for GNUStep only for GUI.

Browse source 
* 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.
This commit is contained in:
Jan Djärv 2013-10-20 11:26:15 +02:00
parent aca5fcdc4c
commit 5f161884b3
3 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -1,5 +1,11 @@
2013-10-20 Jan Djärv <jan.h.d@swipnet.se>
* 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.
* menu-bar.el: Move GNUStep specific menus...
* term/ns-win.el (ns-initialize-window-system): ... to here.

20
lisp/menu-bar.el
View file

@ -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.

7
lisp/term/ns-win.el
View file

@ -899,10 +899,15 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
(x-open-connection (system-name) nil t)
;; Add GNUStep menu items Services, Hide and Quit.
;; Add GNUStep menu items Services, Hide and Quit. Rename Help to Info
;; and put it first (i.e. omit from menu-bar-final-items.
(if (featurep 'gnustep)
(progn
(setq menu-bar-final-items '(buffer services hide-app quit))
;; If running under GNUstep, "Help" is moved and renamed "Info".
(bindings--define-key global-map [menu-bar help-menu]
(cons "Info" menu-bar-help-menu))
(bindings--define-key global-map [menu-bar quit]
'(menu-item "Quit" save-buffers-kill-emacs
:help "Save unsaved buffers, then exit"))