From 00325ecbdb7af835a38075b34f482988ef1d2238 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 30 Sep 2004 22:52:51 +0000 Subject: [PATCH] Synch to No Gnus 200409302248. --- lisp/ChangeLog | 5 +++++ lisp/gnus-mailcap.el | 12 +++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 065ac9a..f30d848 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-10-01 Simon Josefsson + + * mailcap.el (mailcap-mime-data): Add pdf. Remove non-free + acroread. + 2004-10-01 Lars Magne Ingebrigtsen * spam-report.el (spam-report-gmane): Fix interactive. diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el index eb5e871..51abb73 100644 --- a/lisp/gnus-mailcap.el +++ b/lisp/gnus-mailcap.el @@ -135,23 +135,21 @@ (non-viewer . t) (type . "application/zip") ("copiousoutput")) - ;; Prefer free viewers. ("pdf" (viewer . "gv -safer %s") (type . "application/pdf") (test . window-system) ("print" . ,(concat "pdf2ps %s - | " mailcap-print-command))) ("pdf" - (viewer . "xpdf %s") + (viewer . "gpdf %s") (type . "application/pdf") ("print" . ,(concat "pdftops %s - | " mailcap-print-command)) (test . (eq window-system 'x))) ("pdf" - (viewer . "acroread %s") - (type . "application/pdf") - ("print" . ,(concat "cat %s | acroread -toPostScript | " - mailcap-print-command)) - (test . window-system)) + (viewer . "xpdf %s") + (type . "application/pdf") + ("print" . ,(concat "pdftops %s - | " mailcap-print-command)) + (test . (eq window-system 'x))) ("pdf" (viewer . ,(concat "pdftotext %s -")) (type . "application/pdf") -- 1.7.10.4