2 files changed, 5 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9de6bcfb1f..b9165df8eba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,6 +1,8 @@
 2011-09-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * subr.el (eval-after-load): Doc string clarification (bug#9125).
+        (process-kill-buffer-query-function): Mention the buffer name in
+        the query.
 
         * image-mode.el (image-next-line): The line parameter is mandatory
         (bug#9258).
diff --git a/lisp/subr.el b/lisp/subr.el
index c11db6ad949..0d8797b6f63 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1904,7 +1904,9 @@ Value is t if a query was formerly required."
     (or (not process)
         (not (memq (process-status process) '(run stop open listen)))
         (not (process-query-on-exit-flag process))
-        (yes-or-no-p "Buffer has a running process; kill it? "))))
+        (yes-or-no-p
+         (format "Buffer %S has a running process; kill it? "
+                 (buffer-name (current-buffer)))))))
 
 (add-hook 'kill-buffer-query-functions 'process-kill-buffer-query-function)