diff options
| author | Lars Magne Ingebrigtsen | 2011-09-11 05:35:02 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-09-11 05:35:02 +0200 |
| commit | da9fcb933d57d4d8803ccb59a0da072cd03e954f (patch) | |
| tree | 1bd305b1bf9994d61ccd7b1f6966e0c2e8f13970 | |
| parent | 0b1c89c19afb8cc9132212279dc4a4a4927bb5d7 (diff) | |
| download | emacs-da9fcb933d57d4d8803ccb59a0da072cd03e954f.tar.gz emacs-da9fcb933d57d4d8803ccb59a0da072cd03e954f.zip | |
(process-kill-buffer-query-function): Mention the buffer name in the query.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/subr.el | 4 |
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 @@ | |||
| 1 | 2011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2011-09-11 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * subr.el (eval-after-load): Doc string clarification (bug#9125). | 3 | * subr.el (eval-after-load): Doc string clarification (bug#9125). |
| 4 | (process-kill-buffer-query-function): Mention the buffer name in | ||
| 5 | the query. | ||
| 4 | 6 | ||
| 5 | * image-mode.el (image-next-line): The line parameter is mandatory | 7 | * image-mode.el (image-next-line): The line parameter is mandatory |
| 6 | (bug#9258). | 8 | (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." | |||
| 1904 | (or (not process) | 1904 | (or (not process) |
| 1905 | (not (memq (process-status process) '(run stop open listen))) | 1905 | (not (memq (process-status process) '(run stop open listen))) |
| 1906 | (not (process-query-on-exit-flag process)) | 1906 | (not (process-query-on-exit-flag process)) |
| 1907 | (yes-or-no-p "Buffer has a running process; kill it? ")))) | 1907 | (yes-or-no-p |
| 1908 | (format "Buffer %S has a running process; kill it? " | ||
| 1909 | (buffer-name (current-buffer))))))) | ||
| 1908 | 1910 | ||
| 1909 | (add-hook 'kill-buffer-query-functions 'process-kill-buffer-query-function) | 1911 | (add-hook 'kill-buffer-query-functions 'process-kill-buffer-query-function) |
| 1910 | 1912 | ||