[Emacs-diffs] scratch/image-mode-vs-docview 575a835 2/2: doc-view.el (doc-view-kill-proc-and-buffer): Obsolete.

[Artur Malabarba]

branch: scratch/image-mode-vs-docview
commit 575a835f59f895485a238bd6d0db758e73b3e528
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   |    7 +++++++
 lisp/doc-view.el |   10 +++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5357c0a..0d636db 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2015-02-05  Artur Malabarba  <address@hidden>
+
+       * doc-view.el (doc-view-mode): Add `doc-view-kill-proc' to
+       `kill-buffer-hook'.
+       (doc-view-kill-proc-and-buffer): Obsolete. Use `image-kill-buffer'
+       instead.
+
 2015-02-05  Kelly Dean <address@hidden>
 
        * help-mode.el (help-xref-interned): Pass BUFFER and FRAME to
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index b718f1d..ce3c951 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
@@ -1803,6 +1798,7 @@ toggle between displaying the document or editing it as 
text.
     (setq-local cursor-type nil)
     (use-local-map doc-view-mode-map)
     (add-hook 'after-revert-hook 'doc-view-reconvert-doc nil t)
+    (add-hook 'kill-buffer-hook #'doc-view-kill-proc nil 'local)
     (setq-local bookmark-make-record-function
                 #'doc-view-bookmark-make-record)
     (setq mode-name "DocView"