From 1c347cbc3904ae3ea604d16d49c62bdd72047a63 Mon Sep 17 00:00:00 2001 From: kaoru Date: Mon, 15 Aug 2005 13:31:33 +0000 Subject: [PATCH] * riece-options.el (riece-data-directory): Avoid compile time error when locate-data-directory undefined. --- lisp/ChangeLog | 5 +++++ lisp/riece-options.el | 10 +++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cd6dccc..c2862a3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2005-08-15 TAKAHASHI Kaoru + + * riece-options.el (riece-data-directory): Avoid compile time + error when locate-data-directory undefined. + 2005-08-15 Daiki Ueno * riece-options.el (riece-quit-timeout): Set default to 1. diff --git a/lisp/riece-options.el b/lisp/riece-options.el index c037b11..1e1057c 100644 --- a/lisp/riece-options.el +++ b/lisp/riece-options.el @@ -87,9 +87,13 @@ See the document of the function `recenter'." :group 'riece-options) (defcustom riece-data-directory - (if (fboundp 'locate-data-directory) - (locate-data-directory "riece") - (file-name-directory (locate-library (symbol-file 'riece-data-directory)))) + (cond ((fboundp 'locate-data-directory) + (locate-data-directory "riece")) + ((symbol-file 'riece-data-directory) + (file-name-directory + (locate-library (symbol-file 'riece-data-directory)))) + (t + (expand-file-name "riece" data-directory))) "Where to look for data files." :type 'directory :group 'riece-options) -- 1.7.10.4