Revert previous change.

(smiley-data-directory): defvar it before using it in the
defcustom of `smiley-style'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 14c4439..d86dc8c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-12  Reiner Steib  <Reiner.Steib@gmx.de>
+
+       * smiley.el: Revert previous change.
+       (smiley-data-directory): defvar it before using it in the
+       defcustom of `smiley-style'.
+
 2006-04-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * ecomplete.el: Implement more bits.

diff --git a/lisp/smiley.el b/lisp/smiley.el
index 6e0227f..f0249fa 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -58,16 +58,8 @@
   "Turn :-)'s into real images."
   :group 'gnus-visual)
 
-(defcustom smiley-data-directory (smiley-directory)
-  "*Location of the smiley faces files."
-  :set (lambda (symbol value)
-        (set-default symbol value)
-        (smiley-update-cache))
-  :initialize 'custom-initialize-default
-  :type 'directory
-  :group 'smiley)
+(defvar smiley-data-directory)
 
-;; Maybe this should go.
 (defcustom smiley-style 'low-color
   "Smiley style."
   :type '(choice (const :tag "small, 3 colors" low-color)
@@ -95,6 +87,15 @@ is nil, use `smiley-style'."
                 ((eq smiley-style 'medium) "/medium")
                 ((eq smiley-style 'grayscale) "/grayscale")))))
 
+(defcustom smiley-data-directory (smiley-directory)
+  "*Location of the smiley faces files."
+  :set (lambda (symbol value)
+        (set-default symbol value)
+        (smiley-update-cache))
+  :initialize 'custom-initialize-default
+  :type 'directory
+  :group 'smiley)
+
 ;; The XEmacs version has a baroque, if not rococo, set of these.
 (defcustom smiley-regexp-alist
   '(("\\(;-?)\\)\\W" 1 "blink")