[Emacs-diffs] /srv/bzr/emacs/trunk r110351: Have kill-this-buffer don't do anything when frame is not alive or visible (Bug#8184).

[martin rudalics]

------------------------------------------------------------
revno: 110351
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Wed 2012-10-03 10:50:49 +0200
message:
  Have kill-this-buffer don't do anything when frame is not alive or visible 
(Bug#8184).
  
  * menu-bar.el (kill-this-buffer): Don't do anything when
  `menu-frame' is not alive or visible (Bug#8184).
modified:
  lisp/ChangeLog
  lisp/menu-bar.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-10-03 07:18:50 +0000
+++ b/lisp/ChangeLog    2012-10-03 08:50:49 +0000
@@ -1,5 +1,8 @@
 2012-10-03  Martin Rudalics  <address@hidden>
 
+       * menu-bar.el (kill-this-buffer): Don't do anything when
+       `menu-frame' is not alive or visible (Bug#8184).
+
        * emacs-lisp/debug.el (debug): When quitting the debugger window
        restore current buffer (Bug#12502).
 

=== modified file 'lisp/menu-bar.el'
--- a/lisp/menu-bar.el  2012-08-07 16:12:20 +0000
+++ b/lisp/menu-bar.el  2012-10-03 08:50:49 +0000
@@ -1812,9 +1812,14 @@
 When called in the minibuffer, get out of the minibuffer
 using `abort-recursive-edit'."
   (interactive)
-  (if (menu-bar-non-minibuffer-window-p)
-      (kill-buffer (current-buffer))
-    (abort-recursive-edit)))
+  (cond
+   ;; Don't do anything when `menu-frame' is not alive or visible
+   ;; (Bug#8184).
+   ((not (menu-bar-menu-frame-live-and-visible-p)))
+   ((menu-bar-non-minibuffer-window-p)
+    (kill-buffer (current-buffer)))
+   (t
+    (abort-recursive-edit))))
 
 (defun kill-this-buffer-enabled-p ()
   "Return non-nil if the `kill-this-buffer' menu item should be enabled."