diff lisp/x11/x-menubar.el @ 76:c0c698873ce1 r20-0b33

Import from CVS: tag r20-0b33
author cvs
date Mon, 13 Aug 2007 09:05:10 +0200
parents 54cc21c15cbb
children c7528f8e288d
line wrap: on
line diff
--- a/lisp/x11/x-menubar.el	Mon Aug 13 09:04:39 2007 +0200
+++ b/lisp/x11/x-menubar.el	Mon Aug 13 09:05:10 2007 +0200
@@ -385,6 +385,9 @@
        ["Blinking Cursor" (blink-cursor-mode)
 	:style toggle
 	:selected (and (boundp 'blink-cursor-mode) blink-cursor-mode)]
+       ["Frame-Local Font Menu" (setq font-menu-this-frame-only-p
+				    (not font-menu-this-frame-only-p))
+	:style toggle :selected font-menu-this-frame-only-p]
 ;     ["Line Numbers" (line-number-mode nil)
 ;      :style toggle :selected line-number-mode]
       )
@@ -431,9 +434,6 @@
 	:selected buffers-menu-submenus-for-groups-p
 	:active (not (null buffers-menu-grouping-function))]
        "---"
-       ["Frame-Local Font Menu" (setq font-menu-this-frame-only-p
-				    (not font-menu-this-frame-only-p))
-	:style toggle :selected font-menu-this-frame-only-p]
        ["Ignore Scaled Fonts" (setq font-menu-ignore-scaled-fonts
 				    (not font-menu-ignore-scaled-fonts))
 	:style toggle :selected font-menu-ignore-scaled-fonts]
@@ -538,42 +538,48 @@
 
      ("Help"
       ["About XEmacs..."	about-xemacs		t]
+      ("Basics"
+       ["XEmacs Tutorial"	help-with-tutorial	t]
+       ["XEmacs News"		view-emacs-news		t]
+       ["Package Browser"	finder-by-keyword	t]
+       ["Splash Screen"		xemacs-splash-buffer	t])
       "-----"
-      ["XEmacs WWW Page"	xemacs-www-page		t]
-      ["Newest XEmacs FAQ via WWW" xemacs-www-faq	t]
-      ["XEmacs FAQ (local)"	xemacs-local-faq	t]
-      ["XEmacs Tutorial"	help-with-tutorial	t]
-      ["XEmacs News"		view-emacs-news		t]
-      ["Sample"			(find-file
-				 (expand-file-name "sample.emacs"
-						   data-directory))
-       t ".emacs"]
-      ["Sample"			(find-file
-				 (expand-file-name "sample.Xdefaults"
-						   data-directory))
-       t ".Xdefaults"]
+      ("XEmacs FAQ & Web Page"
+       ["XEmacs WWW Page"	xemacs-www-page		t]
+       ["Newest XEmacs FAQ via WWW" xemacs-www-faq	t]
+       ["XEmacs FAQ (local)"	xemacs-local-faq	t])
+      ("Samples"
+       ["Sample"			(find-file
+					 (expand-file-name "sample.emacs"
+							   data-directory))
+	t ".emacs"]
+       ["Sample"			(find-file
+					 (expand-file-name "sample.Xdefaults"
+							   data-directory))
+	t ".Xdefaults"])
       "-----"
-      ["Info (Detailed Docs)"	info			t]
       ("Lookup in Info"
        ["Key/Mouse Binding..."	Info-goto-emacs-key-command-node t]
        ["Command..."		Info-goto-emacs-command-node t]
        ["Elisp Function..."	Info-elisp-ref		t]
        ["Topic..."		Info-query		t])
-      ["Package Browser"	finder-by-keyword	t]
-      ["Describe Mode"		describe-mode		t]
-      ["Apropos..."		hyper-apropos		t]
-      ["Apropos Documentation..." apropos-documentation	t]
+      ("Manuals"
+       ["Info (Detailed Docs)"	info			t]
+       ["Unix Manual..."	manual-entry		t])
+      ("Commands & Keys"
+       ["Describe Mode"		describe-mode		t]
+       ["Apropos..."		hyper-apropos		t]
+       ["Apropos Documentation..." apropos-documentation	t]
+       "-----"
+       ["Describe Key/Mouse..."	describe-key		t]
+       ["List Key Bindings"	describe-bindings	t]
+       ["List Mouse Bindings"	describe-pointer	t]
+       "-----"
+       ["Describe Function..."	describe-function	t]
+       ["Describe Variable..."	describe-variable	t]
+       ["Where Is Command..."	where-is		t])
       "-----"
       ["Recent Keystrokes/Messages" view-lossage	t]
-      ["Describe Key/Mouse..."	describe-key		t]
-      ["List Key Bindings"	describe-bindings	t]
-      ["List Mouse Bindings"	describe-pointer	t]
-      "-----"
-      ["Describe Function..."	describe-function	t]
-      ["Describe Variable..."	describe-variable	t]
-      ["Where Is Command..."	where-is		t]
-      "-----"
-      ["Unix Manual..."		manual-entry		t]
       ("Misc"
        ["Describe No Warranty"	describe-no-warranty	t]
        ["Describe XEmacs License" describe-copying	t]
@@ -1393,6 +1399,15 @@
 ;        "shadowDoubleEtchedOutDash"
 ;        ))
 
+(defun xemacs-splash-buffer ()
+  "Redisplay XEmacs splash screen in a buffer."
+  (interactive)
+  (let ((buffer (get-buffer-create "*Splash*")))
+    (set-buffer buffer)
+    (erase-buffer buffer)
+    (startup-splash-frame)
+    (pop-to-buffer buffer)
+    (delete-other-windows)))
 
 (provide 'x-menubar)