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.

3 files changed, 18 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 708986f5220..40bc3b4fc41 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
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.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index fc15d2dff12..03244aaeb8a 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -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"))