3 files changed, 21 insertions, 11 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3b220f875e4..708986f5220 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-10-20  Jan Djärv  <jan.h.d@swipnet.se>
+
+        * menu-bar.el: Move GNUStep specific menus...
+
+        * term/ns-win.el (ns-initialize-window-system): ... to here.
+
 2013-10-19  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * simple.el (newline): Only run post-self-insert-hook when
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index da80db00910..7c648df36fd 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -44,17 +44,7 @@
     ;; 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))
-  (if (eq system-type 'darwin)
-      (setq menu-bar-final-items '(buffer services help-menu))
-    (setq menu-bar-final-items '(buffer services hide-app quit))
-    ;; Add standard top-level items to GNUstep menu.
-    (bindings--define-key global-map [menu-bar quit]
-      '(menu-item "Quit" save-buffers-kill-emacs
-                   :help "Save unsaved buffers, then exit"))
-    (bindings--define-key global-map [menu-bar hide-app]
-      '(menu-item "Hide" ns-do-hide-emacs
-                  :help "Hide Emacs"))))
+    (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.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index bc9cab375bf..fc15d2dff12 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -899,6 +899,20 @@ 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.
+  (if (featurep 'gnustep)
+      (progn
+        (setq menu-bar-final-items '(buffer services hide-app quit))
+        (bindings--define-key global-map [menu-bar quit]
+          '(menu-item "Quit" save-buffers-kill-emacs
+                      :help "Save unsaved buffers, then exit"))
+        (bindings--define-key global-map [menu-bar hide-app]
+          '(menu-item "Hide" ns-do-hide-emacs
+                      :help "Hide Emacs"))
+        (bindings--define-key global-map [menu-bar services]
+          (cons "Services" (make-sparse-keymap "Services")))))
+
+
   (dolist (service (ns-list-services))
       (if (eq (car service) 'undefined)
           (ns-define-service (cdr service))