[Emacs-diffs] trunk r114723: Fix GNUStep specific menu items.

[Jan D.]

------------------------------------------------------------
revno: 114723
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-10-20 10:50:34 +0200
message:
  Fix GNUStep specific menu items.
  
  * lisp/menu-bar.el: Move GNUStep specific menus...
  
  * lisp/term/ns-win.el (ns-initialize-window-system): ... to here.
  
  * src/nsterm.m (Qcocoa, Qgnustep): New variables.
  (syms_of_nsterm): Defsym Qcocoa, Qgnustep.  Fprovide appropriate one.
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
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/nsterm.m                   nsterm.m-20091113204419-o5vbwnq5f7feedwu-8747

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-10-19 22:17:56 +0000
+++ b/lisp/ChangeLog    2013-10-20 08:50:34 +0000
@@ -1,3 +1,9 @@
+2013-10-20  Jan Djärv  <address@hidden>
+
+       * menu-bar.el: Move GNUStep specific menus...
+
+       * term/ns-win.el (ns-initialize-window-system): ... to here.
+
 2013-10-19  Stefan Monnier  <address@hidden>
 
        * simple.el (newline): Only run post-self-insert-hook when

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

=== modified file 'lisp/term/ns-win.el'
--- a/lisp/term/ns-win.el       2013-10-01 18:22:48 +0000
+++ b/lisp/term/ns-win.el       2013-10-20 08:50:34 +0000
@@ -899,6 +899,20 @@
 
   (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))

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-18 13:33:25 +0000
+++ b/src/ChangeLog     2013-10-20 08:50:34 +0000
@@ -1,3 +1,8 @@
+2013-10-20  Jan Djärv  <address@hidden>
+
+       * nsterm.m (Qcocoa, Qgnustep): New variables.
+       (syms_of_nsterm): Defsym Qcocoa, Qgnustep.  Fprovide appropriate one.
+
 2013-10-18  Eli Zaretskii  <address@hidden>
 
        * keyboard.c (make_lispy_event): Remove GPM-specific code that

=== modified file 'src/nsterm.m'
--- a/src/nsterm.m      2013-10-18 12:57:44 +0000
+++ b/src/nsterm.m      2013-10-20 08:50:34 +0000
@@ -173,6 +173,7 @@
 extern Lisp_Object Qcursor_color, Qcursor_type, Qns, Qleft;
 
 static Lisp_Object QUTF8_STRING;
+static Lisp_Object Qcocoa, Qgnustep;
 
 /* On OS X picks up the default NSGlobalDomain AppleAntiAliasingThreshold,
    the maximum font size to NOT antialias.  On GNUstep there is currently
@@ -7501,11 +7502,17 @@
   /* Tell Emacs about this window system.  */
   Fprovide (Qns, Qnil);
 
+  DEFSYM (Qcocoa, "cocoa");
+  DEFSYM (Qgnustep, "gnustep");
+
   syms_of_nsfont ();
 #ifdef NS_IMPL_COCOA
+  Fprovide (Qcocoa, Qnil);
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1050
   syms_of_macfont ();
 #endif
+#else
+  Fprovide (Qgnustep, Qnil);
 #endif
   
 }