[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master bee76e5 2/2: Make eww use mailcap when displaying P
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master bee76e5 2/2: Make eww use mailcap when displaying PDF files |
Date: |
Fri, 05 Dec 2014 15:52:05 +0000 |
branch: master
commit bee76e566c0e8d9f0b9fc6a48a36cf53e5408f91
Author: Lars Magne Ingebrigtsen <address@hidden>
Commit: Lars Magne Ingebrigtsen <address@hidden>
Make eww use mailcap when displaying PDF files
Fixes: debbugs:19270
* net/eww.el (eww-display-pdf): Let mailcap determine how to
display PDF files.
---
etc/NEWS | 2 ++
lisp/ChangeLog | 5 +++++
lisp/net/eww.el | 3 ++-
3 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/etc/NEWS b/etc/NEWS
index 9d204cf..bb749e8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -210,6 +210,8 @@ xml.el/libxml2 DOM, and a new package dom.el has been added
to
interact with this DOM. See the Emacs Lisp manual for interface
details.
+*** `mailcap-mime-data' is now consulted when displaying PDF files.
+
** Message mode
*** text/html messages that contain inline image parts will be
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 26572c3..2fc3562 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-05 Lars Magne Ingebrigtsen <address@hidden>
+
+ * net/eww.el (eww-display-pdf): Let mailcap determine how to
+ display PDF files (bug#19270).
+
2014-12-05 Juri Linkov <address@hidden>
Compare with the most recent window by default.
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 73abd26..e88afb5 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -493,6 +493,7 @@ See the `eww-search-prefix' variable for the search engine
used."
(shr-put-image data nil))
(goto-char (point-min)))))
+(declare-function mailcap-view-mime "mailcap" (type))
(defun eww-display-pdf ()
(let ((data (buffer-substring (point) (point-max))))
(switch-to-buffer (get-buffer-create "*eww pdf*"))
@@ -500,7 +501,7 @@ See the `eww-search-prefix' variable for the search engine
used."
(inhibit-read-only t))
(erase-buffer)
(insert data)
- (doc-view-mode)))
+ (mailcap-view-mime "application/pdf")))
(goto-char (point-min)))
(defun eww-setup-buffer ()