From dfd32a78d2dd90c069ce648d2222b22532e7cd8e Mon Sep 17 00:00:00 2001 From: hmurata Date: Sat, 21 Feb 2004 06:55:41 +0000 Subject: [PATCH] (elmo-file-command-argument): Fixed problem when a value returned from elmo-file-find is nil. --- elmo/ChangeLog | 5 +++++ elmo/elmo-file.el | 10 +++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/elmo/ChangeLog b/elmo/ChangeLog index f1778aa..7e5cca8 100644 --- a/elmo/ChangeLog +++ b/elmo/ChangeLog @@ -1,3 +1,8 @@ +2004-02-21 Hiroya Murata + + * elmo-file.el (elmo-file-command-argument): Fixed problem when a + value returned from elmo-file-find is nil. + 2004-02-20 Yuuichi Teranishi * elmo-mime.el (elmo-mime-display-as-is-coding-system): Moved diff --git a/elmo/elmo-file.el b/elmo/elmo-file.el index 3a5acad..af09c0c 100644 --- a/elmo/elmo-file.el +++ b/elmo/elmo-file.el @@ -48,11 +48,11 @@ :group 'elmo) (defcustom elmo-file-command-argument - `("-m" - ,(elmo-file-find - '("/usr/share/magic.mime" - "/usr/share/file/magic.mime" - "/cygwin/usr/share/file/magic.mime"))) + (let ((magic-file (elmo-file-find + '("/usr/share/magic.mime" + "/usr/share/file/magic.mime" + "c:/cygwin/usr/share/file/magic.mime")))) + (if magic-file (list "-m" magic-file))) "*Argument list for the `file' command. \(It should return the MIME content type\)" :type '(repeat string) -- 1.7.10.4