diff lisp/packages/info.el @ 98:0d2f883870bc r20-1b1

Import from CVS: tag r20-1b1
author cvs
date Mon, 13 Aug 2007 09:13:56 +0200
parents 6a378aca36af
children 9f59509498e1
line wrap: on
line diff
--- a/lisp/packages/info.el	Mon Aug 13 09:12:43 2007 +0200
+++ b/lisp/packages/info.el	Mon Aug 13 09:13:56 2007 +0200
@@ -1826,11 +1826,11 @@
   (interactive)
   (if Info-standalone
       (save-buffers-kill-emacs)
-    (switch-to-buffer (prog1 (other-buffer (current-buffer))
-			(bury-buffer (current-buffer))
-			(if (featurep 'toolbar)
-			    (if (frame-live-p toolbar-info-frame)
-				(delete-frame toolbar-info-frame)))))))
+    (bury-buffer (current-buffer))
+    (if (and (featurep 'toolbar)
+	     (eq toolbar-info-frame (selected-frame)))
+	(delete-frame toolbar-info-frame)
+      (switch-to-buffer (other-buffer (current-buffer))))))
 
 (defun Info-undefined ()
   "Make command be undefined in Info."