* riece-options.el (riece-data-directory): Use load-file-name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c2862a3..798123a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-16  Daiki Ueno  <ueno@unixuser.org>
+
+       * riece-options.el (riece-data-directory): Use load-file-name.
+

 2005-08-15  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * riece-options.el (riece-data-directory): Avoid compile time
 2005-08-15  TAKAHASHI Kaoru  <kaoru@kaisei.org>
 
        * riece-options.el (riece-data-directory): Avoid compile time

diff --git a/lisp/riece-options.el b/lisp/riece-options.el
index 1e1057c..bd638cc 100644 (file)
--- a/lisp/riece-options.el
+++ b/lisp/riece-options.el
@@ -87,13 +87,9 @@ See the document of the function `recenter'."
   :group 'riece-options)
 
 (defcustom riece-data-directory
   :group 'riece-options)
 
 (defcustom 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)))
+  (if (fboundp 'locate-data-directory)
+      (locate-data-directory "riece")
+    (file-name-directory load-file-name))

   "Where to look for data files."
   :type 'directory
   :group 'riece-options)
   "Where to look for data files."
   :type 'directory
   :group 'riece-options)