From d1efc75b2200672749d7b5daa81188c110051469 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 12 Jun 2001 04:35:08 +0000 Subject: [PATCH] * nnshimbun.el (Gnus-p): Use `file-exists-p' instead of `locate-library' to check for the existence of mailcap.el in the same directory of gnus.el. --- ChangeLog | 7 +++++-- lisp/nnshimbun.el | 12 ++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f468a7..c1374d9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ 2001-06-12 Katsumi Yamaoka - * lisp/nnshimbun.el (nnshimbun-retrieve-headers-with-nov): Remove - a redundant check that I made. + * lisp/nnshimbun.el (Gnus-p): Use `file-exists-p' instead of + `locate-library' to check for the existence of mailcap.el in the + same directory of gnus.el. + (nnshimbun-retrieve-headers-with-nov): Remove a redundant check + that I made. 2001-06-11 Katsumi Yamaoka diff --git a/lisp/nnshimbun.el b/lisp/nnshimbun.el index 3d5ecb9..18f0946 100644 --- a/lisp/nnshimbun.el +++ b/lisp/nnshimbun.el @@ -173,12 +173,12 @@ (eval-and-compile (let ((Gnus-p (eval-when-compile - (let ((gnus (locate-library "gnus")) - ;; Gnus has mailcap.el in the same directory of gnus.el. - (mailcap (locate-library "mailcap"))) - (and gnus mailcap - (string-equal (file-name-directory gnus) - (file-name-directory mailcap))))))) + (let ((gnus (locate-library "gnus"))) + (and gnus + ;; Gnus has mailcap.el in the same directory of gnus.el. + (file-exists-p (expand-file-name + "mailcap.el" + (file-name-directory gnus)))))))) (if Gnus-p (progn (defmacro nnshimbun-mail-header-subject (header) -- 1.7.10.4