Synch to No Gnus 200506270911.

[elisp/gnus.git-] / lisp / smiley.el

diff --git a/lisp/smiley.el b/lisp/smiley.el
index 0411264..fa94333 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -44,7 +44,7 @@
   :group 'gnus-visual)
 
 ;; Maybe this should go.
-(defcustom smiley-data-directory (nnheader-find-etc-directory "smilies")
+(defcustom smiley-data-directory (nnheader-find-etc-directory "images/smilies")
   "*Location of the smiley faces files."
   :type 'directory
   :group 'smiley)
@@ -137,6 +137,7 @@ regexp to replace with IMAGE.  IMAGE is the name of a PBM file in
       (push "xbm" types))
     types)
   "*List of suffixes on picon file names to try."
+  :version "22.1"
   :type '(repeat string)
   :group 'smiley)
 
@@ -195,7 +196,7 @@ A list of images is returned."
                (gnus-add-image 'smiley image)
                (put-text-property (point)
                                   (progn
-                                    (gnus-put-image image string)
+                                    (gnus-put-image image string 'smiley)
                                     (point))
                                   'smilified t)))))
        (put-text-property beg (or end (point-max)) 'smilified nil)