X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fgnus-xmas.el;h=37037c2224c45f65a1bdb3cbaeec45d31b16e657;hb=348ca824b5116f395afc7d69321c3cedf60b0d3f;hp=92d9d8e30c167ca341575fec0be4ba00cb17cf9d;hpb=5357096aae0887174a86d6a6796112d6b3d2d53e;p=elisp%2Fgnus.git-

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 92d9d8e..37037c2 100644
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -1,6 +1,6 @@
 ;;; gnus-xmas.el --- Gnus functions for XEmacs
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -21,8 +21,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -40,7 +40,7 @@
 (defvar menu-bar-mode (featurep 'menubar))
 (require 'messagexmas)
 (require 'wid-edit)
-(require 'run-at-time)
+(require 'timer-funcs)
 
 (defgroup gnus-xmas nil
   "XEmacsoid support for Gnus"
@@ -543,7 +543,7 @@ the resulting string may be narrower than END-COLUMN.
 	      " based on " gnus-original-product-name " v"
 	      gnus-original-version-number "\n")
       (end-of-line 0)
-      (put-text-property (point-min) (point) 'face 'gnus-splash-face)
+      (put-text-property (point-min) (point) 'face 'gnus-splash)
       (insert-char ?\  (prog1
 			   (max 0 (/ (- (window-width) (point)) 2))
 			 (goto-char (point-min))))
@@ -593,7 +593,7 @@ the resulting string may be narrower than END-COLUMN.
 	   (rest (- wheight pheight)))
       (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n)))
     ;; Paint it.
-    (put-text-property (point-min) (point-max) 'face 'gnus-splash-face)))
+    (put-text-property (point-min) (point-max) 'face 'gnus-splash)))
   (goto-char (point-min))
   (setq modeline-buffer-identification
 	(list (concat gnus-version ": *Group*")))
@@ -914,12 +914,13 @@ Warning: Don't insert text immediately after the image."
   glyph)
 
 (defun gnus-xmas-remove-image (image &optional category)
+  "Remove the image matching IMAGE and CATEGORY found first."
   (map-extents
    (lambda (ext unused)
      (when (equal (extent-end-glyph ext) image)
        (set-extent-property ext 'invisible nil)
-       (set-extent-property ext 'end-glyph nil))
-     nil)
+       (set-extent-property ext 'end-glyph nil)
+       t))
    nil nil nil nil nil 'gnus-image category))
 
 (defun gnus-xmas-assq-delete-all (key alist)