Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-589

Merge from gnus--rel--5.10

Patches applied:

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-39
   Merge from emacs--cvs-trunk--0

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-40
 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-41
   Update from CVS

3 files changed, 18 insertions, 9 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 6ac6d46e28f..907ad5f3411 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2004-10-01  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+        * gnus-sum.el (gnus-summary-toggle-header): Make it work even if
+        there's no visible header.
+
+2004-10-01  Simon Josefsson  <jas@extundo.com>
+
+        * mailcap.el (mailcap-mime-data): Add pdf.  Remove non-free
+        acroread.
+
 2004-09-29  Jesper Harder  <harder@ifa.au.dk>
 
         * gnus.el (gnus-method-to-server): Oops, move it don't delete it.
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 8cee2227f3f..92ba2346949 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -8732,7 +8732,8 @@ If ARG is a negative number, hide the unwanted header lines."
              (inhibit-point-motion-hooks t)
              (hidden (if (numberp arg)
                          (>= arg 0)
-                       (gnus-article-hidden-text-p 'headers)))
+                       (or (not (looking-at "[^ \t\n]+:"))
+                           (gnus-article-hidden-text-p 'headers))))
              s e)
         (delete-region (point-min) (point-max))
         (with-current-buffer gnus-original-article-buffer
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index db0ab6143e1..d285e342370 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -1,5 +1,5 @@
 ;;; mailcap.el --- MIME media types configuration
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004
 ;;       Free Software Foundation, Inc.
 
 ;; Author: William M. Perry <wmperry@aventail.com>
@@ -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")