Mercurial > hg > xemacs-beta

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-0b33
author cvs
date Mon, 13 Aug 2007 09:05:10 +0200
parents 131b0175ea99
children 1ce6082ce73f
line wrap: on
line diff
--- a/lisp/x11/x-toolbar.el	Mon Aug 13 09:04:39 2007 +0200
+++ b/lisp/x11/x-toolbar.el	Mon Aug 13 09:05:10 2007 +0200
@@ -54,7 +54,7 @@
 	(progn
 	  (setq toolbar-mail-frame (make-frame))
 	  (add-hook 'vm-quit-hook
-		    '(lambda ()
+		    (lambda ()
 		       (save-excursion
 			 (if (frame-live-p toolbar-mail-frame)
 			     (delete-frame toolbar-mail-frame)))))
@@ -121,19 +121,20 @@
   "The frame in which news is displayed.")
 
 (defun toolbar-news ()
-  "Run GNUS in a separate frame."
+  "Run Gnus in a separate frame."
   (interactive)
-  (if (or (not toolbar-news-frame)
-	  (not (frame-live-p toolbar-news-frame)))
-      (progn
-	(setq toolbar-news-frame (make-frame))
-	(add-hook 'gnus-exit-gnus-hook
-		  '(lambda ()
-		     (if (frame-live-p toolbar-news-frame)
-			 (delete-frame toolbar-news-frame))))
-	(select-frame toolbar-news-frame)
-	(raise-frame toolbar-news-frame)
-	(gnus)))
+  (when (or (not toolbar-news-frame)
+	    (not (frame-live-p toolbar-news-frame)))
+    (setq toolbar-news-frame (make-frame))
+    (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)