Merge from emacs--devo--0, emacs--rel--22

[gnus] / lisp / smiley.el

diff --git a/lisp/smiley.el b/lisp/smiley.el
index b0f1948..3847603 100644 (file)
--- a/lisp/smiley.el
+++ b/lisp/smiley.el
@@ -1,7 +1,7 @@
 ;;; smiley.el --- displaying smiley faces
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006, 2007 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: news mail multimedia
@@ -76,7 +76,7 @@
         (setq smiley-data-directory (smiley-directory))
         (smiley-update-cache))
   :initialize 'custom-initialize-default
-  :version "23.0" ;; No Gnus
+  :version "23.1" ;; No Gnus
   :group 'smiley)
 
 ;; For compatibility, honor the variable `smiley-data-directory' if the user
@@ -228,5 +228,5 @@ With arg, turn displaying on if and only if arg is positive."
 
 (provide 'smiley)
 
-;;; arch-tag: 5beb161b-4321-40af-8ac9-876afb8ee818
+;; arch-tag: 5beb161b-4321-40af-8ac9-876afb8ee818
 ;;; smiley.el ends here