[Emacs-diffs] trunk r114724: Make Info menu for GNUStep only for GUI.

[Jan D.]

------------------------------------------------------------
revno: 114724
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-10-20 11:26:15 +0200
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/menu-bar.el               menubar.el-20091113204419-o5vbwnq5f7feedwu-546
  lisp/term/ns-win.el            nswin.el-20091113204419-o5vbwnq5f7feedwu-8708

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-20 08:50:34 +0000
+++ b/lisp/ChangeLog    2013-10-20 09:26:15 +0000
@@ -1,5 +1,11 @@
 2013-10-20  Jan Djärv  <address@hidden>
 
+       * 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.

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2013-10-20 08:50:34 +0000
+++ b/lisp/menu-bar.el  2013-10-20 09:26:15 +0000
@@ -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 @@
   (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.

=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el       2013-10-20 08:50:34 +0000
+++ b/lisp/term/ns-win.el       2013-10-20 09:26:15 +0000
@@ -899,10 +899,15 @@
 
   (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"))