[Emacs-diffs] Changes to emacs/lisp/menu-bar.el,v

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     08/03/16 17:44:21

Index: menu-bar.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/menu-bar.el,v
retrieving revision 1.324
retrieving revision 1.325
diff -u -b -r1.324 -r1.325
--- menu-bar.el 14 Mar 2008 17:42:16 -0000      1.324
+++ menu-bar.el 16 Mar 2008 17:44:20 -0000      1.325
@@ -1439,9 +1439,13 @@
     (not (window-minibuffer-p (frame-selected-window menu-frame)))))
 
 (defun kill-this-buffer ()     ; for the menu bar
-  "Kill the current buffer."
+  "Kill the current buffer.
+When called in the minibuffer, get out of the minibuffer
+using `abort-recursive-edit'."
   (interactive)
-  (kill-buffer (current-buffer)))
+  (if (menu-bar-non-minibuffer-window-p)
+      (kill-buffer (current-buffer))
+    (abort-recursive-edit)))
 
 (defun kill-this-buffer-enabled-p ()
   (let ((count 0)
@@ -1450,7 +1454,7 @@
       (or (string-match "^ " (buffer-name (car buffers)))
          (setq count (1+ count)))
       (setq buffers (cdr buffers)))
-    (and (menu-bar-non-minibuffer-window-p)
+    (or (not (menu-bar-non-minibuffer-window-p))
         (> count 1))))
 
 (put 'dired 'menu-enable '(menu-bar-non-minibuffer-window-p))