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'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68c2dab829d0613101846228b28cebd7ab667e90..32bbd2ccf3f59b8740f5c8313194095789412d90 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-06  Artur Malabarba  <bruce.connor.am@gmail.com>
+
+       * doc-view.el (doc-view-kill-proc-and-buffer): Obsolete. Use
+       `image-kill-buffer' instead.
+
 2015-02-06  Thomas Fitzsimmons  <fitzsim@fitzsim.org>
 
        * net/ldap.el (ldap-search-internal): Fix docstring.

diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index b718f1d8b2c338847eafa64aceae9b63e511097f..5f1c94a01286cedb038ece6ca352fd04bf29de44 100644 (file)
--- 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