From d20dda5b1d899018825f1f3e7099f22455d83afe Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Wed, 21 Oct 2015 05:36:45 +0000 Subject: [PATCH] mailcap.el (mailcap-mailcap-entry-passes-test): Doc fix --- lisp/ChangeLog | 4 ++++ lisp/mailcap.el | 7 +++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c8c5b3ebb..7e8e899e1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2015-10-14 Katsumi Yamaoka + + * mailcap.el (mailcap-mailcap-entry-passes-test): Doc fix. + 2015-10-20 Michael Sperber * mailcap.el (mailcap-mime-data): Conditonalize `doc-view-mode', which diff --git a/lisp/mailcap.el b/lisp/mailcap.el index a3348c698..d8881104a 100644 --- a/lisp/mailcap.el +++ b/lisp/mailcap.el @@ -556,8 +556,11 @@ MAILCAPS if set; otherwise (on Unix) use the path from RFC 1524, plus results))) (defun mailcap-mailcap-entry-passes-test (info) - "Return non-nil if mailcap entry INFO passes its test clause. -Also return non-nil if no test clause is present." + "Replace the test clause of INFO itself with a boolean for some cases. +This function supports only `test -n $DISPLAY' and `test -z $DISPLAY', +replaces them with t or nil. As for others or if INFO has a interactive +spec (needsterm, needsterminal, or needsx11) but DISPLAY is not set, +the test clause will be unchanged." (let ((test (assq 'test info)) ; The test clause status) (setq status (and test (split-string (cdr test) " "))) -- 2.25.1