summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/mailcap.el5
2 files changed, 11 insertions, 0 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5f8b092c62a..7a4c463208a 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-23 Tassilo Horn <tsdh@gnu.org>
+
+ * mailcap.el (mailcap-mime-data): Support `pdf-view-mode' (from PDF
+ Tools: https://github.com/politza/pdf-tools) for viewing PDF
+ attachments in emacs.
+
2015-02-23 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-mime-display-single): Avoid "End of buffer" error.
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index 01d8587f06a..9f844139960 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -153,6 +153,11 @@ This is a compatibility function for different Emacsen."
(type . "application/zip")
("copiousoutput"))
("pdf"
+ (viewer . pdf-view-mode)
+ (type . "application/pdf")
+ (test . (and (fboundp 'pdf-view-mode)
+ (eq window-system 'x))))
+ ("pdf"
(viewer . doc-view-mode)
(type . "application/pdf")
(test . (eq window-system 'x)))