diff lisp/x-toolbar.el @ 217:d44af0c54775 r20-4b7

Import from CVS: tag r20-4b7
author cvs
date Mon, 13 Aug 2007 10:08:34 +0200
parents 1f0dabaa0855
children 262b8bb4a523
line wrap: on
line diff
--- a/lisp/x-toolbar.el	Mon Aug 13 10:07:42 2007 +0200
+++ b/lisp/x-toolbar.el	Mon Aug 13 10:08:34 2007 +0200
@@ -330,28 +330,34 @@
 (defvar toolbar-news-frame nil
   "The frame in which news is displayed.")
 
-(defvar toolbar-news-frame-properties nil
-  "The properties of the frame in which news is displayed.")
+(defcustom toolbar-news-frame-properties nil
+  "*The properties of the frame in which news is displayed."
+  :type '(repeat (group :inline t
+			(symbol :tag "Property")
+			(sexp :tag "Value")))
+  :group 'toolbar)
 
 (defun toolbar-gnus ()
   "Run Gnus in a separate frame."
   (interactive)
-  (when (or (not toolbar-news-frame)
-	    (not (frame-live-p toolbar-news-frame)))
-    (setq toolbar-news-frame (make-frame toolbar-news-frame-properties))
-    (add-hook 'gnus-exit-gnus-hook
-	      (lambda ()
-		(when (frame-live-p toolbar-news-frame)
-		  (if (cdr (frame-list))
-		      (delete-frame toolbar-news-frame))
-                  (setq toolbar-news-frame nil))))
-    (select-frame toolbar-news-frame)
-    (raise-frame toolbar-news-frame)
-    (gnus))
-  (if (frame-iconified-p toolbar-news-frame)
-      (deiconify-frame toolbar-news-frame))
-  (select-frame toolbar-news-frame)
-  (raise-frame toolbar-news-frame))
+  (if (not toolbar-news-use-separate-frame)
+      (gnus)
+    (unless (frame-live-p toolbar-news-frame)
+      (setq toolbar-news-frame (make-frame toolbar-news-frame-properties))
+      (add-hook 'gnus-exit-gnus-hook
+		(lambda ()
+		  (when (frame-live-p toolbar-news-frame)
+		    (if (cdr (frame-list))
+			(delete-frame toolbar-news-frame))
+		    (setq toolbar-news-frame nil))))
+      (select-frame toolbar-news-frame)
+      (raise-frame toolbar-news-frame)
+      (gnus))
+    (when (framep toolbar-news-frame)
+      (when (frame-iconified-p toolbar-news-frame)
+	(deiconify-frame toolbar-news-frame))
+      (select-frame toolbar-news-frame)
+      (raise-frame toolbar-news-frame))))
 
 (defun toolbar-news ()
   "Run News (in a separate frame??)."