X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-xmas.el;h=41108ab602e6b9b81dcc585dd273499cc9ff9139;hb=bbe68edb313e02acb4557e5cc4ff2f87a41ca66c;hp=2e0586d4d5a157d58450c88242426430746998c4;hpb=707f51a37c63cc5df71b0c829d4648b0742ee62c;p=gnus

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 2e0586d4d..41108ab60 100644
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -1,7 +1,6 @@
 ;;; gnus-xmas.el --- Gnus functions for XEmacs
 
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2005, 2006, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2012 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -406,14 +405,6 @@ then we display only bindings that start with that prefix."
   (unless (face-differs-from-default-p 'underline)
     (funcall (intern "set-face-underline-p") 'underline t))
 
-  (cond
-   ((fboundp 'char-or-char-int-p)
-    ;; Handle both types of marks for XEmacs-20.x.
-    (defalias 'gnus-characterp 'char-or-char-int-p))
-   ;; V19 of XEmacs, probably.
-   (t
-    (defalias 'gnus-characterp 'characterp)))
-
   (defalias 'gnus-make-overlay
     (lambda (beg end &optional buffer front-advance rear-advance)
       "Create a new overlay with range BEG to END in BUFFER.
@@ -436,6 +427,14 @@ FRONT-ADVANCE and REAR-ADVANCE are ignored."
   (defalias 'gnus-window-edges 'window-pixel-edges)
   (defalias 'gnus-assq-delete-all 'gnus-xmas-assq-delete-all)
 
+  (unless (fboundp 'member-ignore-case)
+    (defun member-ignore-case (elt list)
+      (while (and list
+		  (or (not (stringp (car list)))
+		      (not (string= (downcase elt) (downcase (car list))))))
+	(setq list (cdr list)))
+      list))
+
   (unless (boundp 'standard-display-table)
     (setq standard-display-table nil))
 
@@ -451,13 +450,6 @@ FRONT-ADVANCE and REAR-ADVANCE are ignored."
   (unless (fboundp 'match-string-no-properties)
     (defalias 'match-string-no-properties 'match-string))
 
-  (defalias 'gnus-x-color-values
-	(if (fboundp 'x-color-values)
-	    'x-color-values
-	  (lambda (color)
-	    (color-instance-rgb-components
-	     (make-color-instance color)))))
-
   (unless (fboundp 'char-width)
     (defalias 'char-width (lambda (ch) 1))))
 
@@ -534,8 +526,7 @@ FRONT-ADVANCE and REAR-ADVANCE are ignored."
       (while (not (eobp))
 	(insert (make-string (/ (max (- (window-width) (or x 35)) 0) 2)
 			     ?\ ))
-	(forward-line 1))
-      (setq gnus-simple-splash nil))
+	(forward-line 1)))
     (goto-char (point-min))
     (let* ((pheight (+ 20 (count-lines (point-min) (point-max))))
 	   (wheight (window-height))
@@ -820,10 +811,6 @@ XEmacs compatibility workaround."
 	 (cons gnus-xmas-modeline-left-extent (substring line 0 chop)))
        (cons gnus-xmas-modeline-right-extent (substring line chop)))))))
 
-(defun gnus-xmas-splash ()
-  (when (eq (device-type) 'x)
-    (gnus-splash)))
-
 (defun gnus-xmas-annotation-in-region-p (b e)
   (or (map-extents (lambda (e u) t) nil b e nil nil 'mm t)
       (if (= b e)