[Emacs-diffs] master 5c9ad35 2/2: doc-view.el (doc-view-kill-proc-and-buffer): Obsolete.

[Artur Malabarba]

branch: master
commit 5c9ad35f1e5fd8ee5561ef48baac1f6ff20ae679
Author: Artur Malabarba <address@hidden>
Commit: Artur Malabarba <address@hidden>

    doc-view.el (doc-view-kill-proc-and-buffer): Obsolete.
    
    Use image-kill-buffer instead.
    (doc-view-mode): Add `doc-view-kill-proc' to `kill-buffer-hook'.
---
 lisp/ChangeLog   |    5 +++++
 lisp/doc-view.el |    9 ++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68c2dab..32bbd2c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-06  Artur Malabarba  <address@hidden>
+
+       * doc-view.el (doc-view-kill-proc-and-buffer): Obsolete. Use
+       `image-kill-buffer' instead.
+
 2015-02-06  Thomas Fitzsimmons  <address@hidden>
 
        * net/ldap.el (ldap-search-internal): Fix docstring.
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index b718f1d..5f1c94a 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -415,7 +415,6 @@ Typically \"page-%s.png\".")
     (define-key map "H"               'doc-view-fit-height-to-window)
     (define-key map "P"               'doc-view-fit-page-to-window)
     ;; Killing the buffer (and the process)
-    (define-key map (kbd "k")         'doc-view-kill-proc-and-buffer)
     (define-key map (kbd "K")         'doc-view-kill-proc)
     ;; Slicing the image
     (define-key map (kbd "s s")       'doc-view-set-slice)
@@ -645,12 +644,8 @@ at the top edge of the page moves to the previous page."
     (setq doc-view--current-timer nil))
   (setq mode-line-process nil))
 
-(defun doc-view-kill-proc-and-buffer ()
-  "Kill the current converter process and buffer."
-  (interactive)
-  (doc-view-kill-proc)
-  (when (eq major-mode 'doc-view-mode)
-    (kill-buffer (current-buffer))))
+(define-obsolete-function-alias 'doc-view-kill-proc-and-buffer
+  #'image-kill-buffer "25.1")
 
 (defun doc-view-make-safe-dir (dir)
   (condition-case nil