From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Tue, 3 Nov 2020 14:50:44 +0000 (+0100)
Subject: Let pdf-view-mode take precedence over doc-view-mode
X-Git-Tag: emacs-28.0.90~5241
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ef5211d0aa3186fffa43639072fc3325a3003623;p=emacs.git

Let pdf-view-mode take precedence over doc-view-mode

* lisp/net/mailcap.el (mailcap-mime-data): Note the order, and let
pdf-view-mode take precedence, since it's an optional package
(bug#44338).
---

diff --git a/lisp/net/mailcap.el b/lisp/net/mailcap.el
index 94cd9e21566..f9c71c9b9f9 100644
--- a/lisp/net/mailcap.el
+++ b/lisp/net/mailcap.el
@@ -175,11 +175,11 @@ is consulted."
       (type   . "application/zip")
       ("copiousoutput"))
      ("pdf"
-      (viewer . pdf-view-mode)
+      (viewer . doc-view-mode)
       (type . "application/pdf")
       (test . window-system))
      ("pdf"
-      (viewer . doc-view-mode)
+      (viewer . pdf-view-mode)
       (type . "application/pdf")
       (test . window-system))
      ("pdf"
@@ -330,7 +330,10 @@ Content-Type header as argument to return a boolean value for the
 validity.  Otherwise, if it is a non-function Lisp symbol or list
 whose car is a symbol, it is `eval'uated to yield the validity.  If it
 is a string or list of strings, it represents a shell command to run
-to return a true or false shell value for the validity.")
+to return a true or false shell value for the validity.
+
+The last matching entry in this structure takes presedence over
+preceding entries.")
 (put 'mailcap-mime-data 'risky-local-variable t)
 
 (defvar mailcap--computed-mime-data nil