X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-xmas.el;h=4df1a718a8cbdd9377dc2c55e29747762d6d54ed;hb=b28454eed83f245c4160228b076134ce930b320a;hp=40e7e4d0f67aa9031e3edd93591990d08d400a7d;hpb=ad9b4ba38132b1bc2be77c80fecd2c4333d03ff2;p=gnus

diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el
index 40e7e4d0f..4df1a718a 100644
--- a/lisp/gnus-xmas.el
+++ b/lisp/gnus-xmas.el
@@ -1,5 +1,5 @@
 ;;; gnus-xmas.el --- Gnus functions for XEmacs
-;; Copyright (C) 1995,96 Free Software Foundation, Inc.
+;; Copyright (C) 1995,96,97 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Keywords: news
@@ -26,7 +26,6 @@
 ;;; Code:
 
 (require 'text-props)
-(eval-when-compile (require 'cl))
 (defvar menu-bar-mode (featurep 'menubar))
 (require 'messagexmas)
 
@@ -36,8 +35,8 @@ If this variable is nil, Gnus will try to locate the directory
 automatically.")
 
 (defvar gnus-xmas-logo-color-alist
-  '((flame "#cc3300" "#ff2200") 
-    (pine "#c0cc93" "#f8ffb8") 
+  '((flame "#cc3300" "#ff2200")
+    (pine "#c0cc93" "#f8ffb8")
     (moss "#a1cc93" "#d2ffb8")
     (irish "#04cc90" "#05ff97")
     (sky "#049acc" "#05deff")
@@ -50,7 +49,7 @@ automatically.")
     (september "#bf9900" "#ffcc00"))
   "Color alist used for the Gnus logo.")
 
-(defvar gnus-xmas-logo-color-style 'september
+(defvar gnus-xmas-logo-color-style 'flame
   "Color styles used for the Gnus logo.")
 
 (defvar gnus-xmas-logo-colors
@@ -118,10 +117,10 @@ asynchronously.	 The compressed face will be piped to this command.")
 (defun gnus-xmas-set-text-properties (start end props &optional buffer)
   "You should NEVER use this function.  It is ideologically blasphemous.
 It is provided only to ease porting of broken FSF Emacs programs."
-  (if (stringp buffer) 
+  (if (stringp buffer)
       nil
     (map-extents (lambda (extent ignored)
-		   (remove-text-properties 
+		   (remove-text-properties
 		    start end
 		    (list (extent-property extent 'text-prop) nil)
 		    buffer))
@@ -130,14 +129,20 @@ It is provided only to ease porting of broken FSF Emacs programs."
 
 (defun gnus-xmas-highlight-selected-summary ()
   ;; Highlight selected article in summary buffer
-  (if gnus-summary-selected-face
-      (progn
-	(if gnus-newsgroup-selected-overlay
-	    (delete-extent gnus-newsgroup-selected-overlay))
-	(setq gnus-newsgroup-selected-overlay 
-	      (make-extent (gnus-point-at-bol) (gnus-point-at-eol)))
-	(set-extent-face gnus-newsgroup-selected-overlay
-			 gnus-summary-selected-face))))
+  (when gnus-summary-selected-face
+    (when gnus-newsgroup-selected-overlay
+      (delete-extent gnus-newsgroup-selected-overlay))
+    (setq gnus-newsgroup-selected-overlay
+	  (make-extent (gnus-point-at-bol) (gnus-point-at-eol)))
+    (set-extent-face gnus-newsgroup-selected-overlay
+		     gnus-summary-selected-face)))
+
+(defvar gnus-xmas-force-redisplay nil
+  "If non-nil, force a redisplay before recentering the summary buffer.
+This is ugly, but it works around a bug in `window-displayed-height'.")
+
+(defun gnus-xmas-switch-horizontal-scrollbar-off ()
+  (set-specifier scrollbar-height (cons (current-buffer) 0)))
 
 (defun gnus-xmas-summary-recenter ()
   "\"Center\" point in the summary window.
@@ -145,11 +150,12 @@ If `gnus-auto-center-summary' is nil, or the article buffer isn't
 displayed, no centering will be performed."
   ;; Suggested by earle@mahendo.JPL.NASA.GOV (Greg Earle).
   ;; Recenter only when requested.  Suggested by popovich@park.cs.columbia.edu.
+  ;; Force redisplay to get properly computed window height.
+  (when gnus-xmas-force-redisplay
+    (sit-for 0))
   (when gnus-auto-center-summary
     (let* ((height (if (fboundp 'window-displayed-height)
-		       (progn
-			 (sit-for 0)
-			 (window-displayed-height))
+		       (window-displayed-height)
 		     (- (window-height) 2)))
 	   (top (cond ((< height 4) 0)
 		      ((< height 7) 1)
@@ -164,8 +170,7 @@ displayed, no centering will be performed."
 	;; possible valid number, or the second line from the top,
 	;; whichever is the least.
 	(set-window-start
-	 window (min bottom (save-excursion 
-			      (forward-line (- top)) (point)))))
+	 window (min bottom (save-excursion (forward-line (- top)) (point)))))
       ;; Do horizontal recentering while we're at it.
       (when (and (get-buffer-window (current-buffer) t)
 		 (not (eq gnus-auto-center-summary 'vertical)))
@@ -190,24 +195,6 @@ displayed, no centering will be performed."
   (map-extents (lambda (extent arg)
 		 (set-extent-property extent 'start-open t))
 	       nil point (min (1+ (point)) (point-max))))
-		  
-(defun gnus-xmas-copy-article-buffer (&optional article-buffer)
-  (setq gnus-article-copy (get-buffer-create " *gnus article copy*"))
-  (buffer-disable-undo gnus-article-copy)
-  (or (memq gnus-article-copy gnus-buffer-list)
-      (setq gnus-buffer-list (cons gnus-article-copy gnus-buffer-list)))
-  (let ((article-buffer (or article-buffer gnus-article-buffer))
-	buf)
-    (if (and (get-buffer article-buffer)
-	     (buffer-name (get-buffer article-buffer)))
-	(save-excursion
-	  (set-buffer article-buffer)
-	  (widen)
-	  (setq buf (buffer-substring (point-min) (point-max)))
-	  (set-buffer gnus-article-copy)
-	  (erase-buffer)
-	  (insert (format "%s" buf))))
-    gnus-article-copy))
 
 (defun gnus-xmas-article-push-button (event)
   "Check text under the mouse pointer for a callback function.
@@ -218,7 +205,8 @@ call it with the value of the `gnus-data' text property."
   (let* ((pos (event-closest-point event))
 	 (data (get-text-property pos 'gnus-data))
 	 (fun (get-text-property pos 'gnus-callback)))
-    (if fun (funcall fun data))))
+    (when fun
+      (funcall fun data))))
 
 (defun gnus-xmas-move-overlay (extent start end &optional buffer)
   (set-extent-endpoints extent start end))
@@ -226,10 +214,10 @@ call it with the value of the `gnus-data' text property."
 ;; Fixed by Christopher Davis <ckd@loiosh.kei.com>.
 (defun gnus-xmas-article-add-button (from to fun &optional data)
   "Create a button between FROM and TO with callback FUN and data DATA."
-  (and gnus-article-button-face
-       (gnus-overlay-put (gnus-make-overlay from to) 
-			 'face gnus-article-button-face))
-  (gnus-add-text-properties 
+  (when gnus-article-button-face
+    (gnus-overlay-put (gnus-make-overlay from to)
+		      'face gnus-article-button-face))
+  (gnus-add-text-properties
    from to
    (nconc
     (and gnus-article-mouse-face
@@ -267,24 +255,21 @@ call it with the value of the `gnus-data' text property."
          (window-search t))
     (while window-search
       (let* ((this-window (next-window))
-             (next-bottom-edge (car (cdr (cdr (cdr 
-                                               (window-pixel-edges 
+             (next-bottom-edge (car (cdr (cdr (cdr
+                                               (window-pixel-edges
 						this-window)))))))
-        (if (< bottom-edge next-bottom-edge)
-            (progn
-              (setq bottom-edge next-bottom-edge)
-              (setq lowest-window this-window)))
+        (when (< bottom-edge next-bottom-edge)
+	  (setq bottom-edge next-bottom-edge)
+	  (setq lowest-window this-window))
 
         (select-window this-window)
-        (if (eq last-window this-window)
-            (progn
-              (select-window lowest-window)
-              (setq window-search nil)))))))
+        (when (eq last-window this-window)
+	  (select-window lowest-window)
+	  (setq window-search nil))))))
 
 (defmacro gnus-xmas-menu-add (type &rest menus)
   `(gnus-xmas-menu-add-1 ',type ',menus))
 (put 'gnus-xmas-menu-add 'lisp-indent-function 1)
-(put 'gnus-xmas-menu-add 'lisp-indent-hook 1)
 
 (defun gnus-xmas-menu-add-1 (type menus)
   (when (and menu-bar-mode
@@ -298,17 +283,26 @@ call it with the value of the `gnus-data' text property."
 
 (defun gnus-xmas-summary-menu-add ()
   (gnus-xmas-menu-add summary
+    gnus-summary-misc-menu gnus-summary-kill-menu
     gnus-summary-article-menu gnus-summary-thread-menu
-    gnus-summary-misc-menu gnus-summary-post-menu gnus-summary-kill-menu))
+    gnus-summary-post-menu ))
 
 (defun gnus-xmas-article-menu-add ()
   (gnus-xmas-menu-add article
     gnus-article-article-menu gnus-article-treatment-menu))
 
+(defun gnus-xmas-score-menu-add ()
+  (gnus-xmas-menu-add score
+    gnus-score-menu))
+
 (defun gnus-xmas-pick-menu-add ()
   (gnus-xmas-menu-add pick
     gnus-pick-menu))
 
+(defun gnus-xmas-topic-menu-add ()
+  (gnus-xmas-menu-add topic
+    gnus-topic-menu))
+
 (defun gnus-xmas-binary-menu-add ()
   (gnus-xmas-menu-add binary
     gnus-binary-menu))
@@ -319,7 +313,7 @@ call it with the value of the `gnus-data' text property."
 
 (defun gnus-xmas-server-menu-add ()
   (gnus-xmas-menu-add menu
-    gnus-server-menu))
+    gnus-server-server-menu gnus-server-connections-menu))
 
 (defun gnus-xmas-browse-menu-add ()
   (gnus-xmas-menu-add browse
@@ -331,28 +325,30 @@ call it with the value of the `gnus-data' text property."
 
 (defun gnus-xmas-read-event-char ()
   "Get the next event."
-  (let ((event (next-event)))
+  (let ((event (next-command-event)))
+    (sit-for 0)
     ;; We junk all non-key events.  Is this naughty?
-    (while (not (key-press-event-p event))
-      (setq event (next-event)))
-    (cons (and (key-press-event-p event) 
-	      ; (numberp (event-key event))
-	       (event-to-character event)) 
+    (while (not (or (key-press-event-p event)
+		    (button-press-event-p event)))
+      (dispatch-event event)
+      (setq event (next-command-event)))
+    (cons (and (key-press-event-p event)
+	       (event-to-character event))
 	  event)))
 
 (defun gnus-xmas-group-remove-excess-properties ()
   (let ((end (point))
 	(beg (progn (forward-line -1) (point))))
     (remove-text-properties (1+ beg) end '(gnus-group nil))
-    (remove-text-properties 
-     beg end 
+    (remove-text-properties
+     beg end
      '(gnus-topic nil gnus-topic-level nil gnus-topic-visible nil))
     (goto-char end)
-    (map-extents 
+    (map-extents
      (lambda (e ma)
        (set-extent-property e 'start-closed t))
      (current-buffer) beg end)))
-		  
+
 (defun gnus-xmas-topic-remove-excess-properties ()
   (let ((end (point))
 	(beg (progn (forward-line -1) (point))))
@@ -369,9 +365,9 @@ call it with the value of the `gnus-data' text property."
 			 (aref (timezone-parse-date date) 3))))
 	 (edate (mapcar (lambda (ti) (and ti (string-to-int ti)))
 			(timezone-parse-date "Jan 1 12:00:00 1970")))
-	 (tday (- (timezone-absolute-from-gregorian 
+	 (tday (- (timezone-absolute-from-gregorian
 		   (nth 1 tdate) (nth 2 tdate) (nth 0 tdate))
-		  (timezone-absolute-from-gregorian 
+		  (timezone-absolute-from-gregorian
 		   (nth 1 edate) (nth 2 edate) (nth 0 edate)))))
     (+ (nth 2 ttime)
        (* (nth 1 ttime) 60)
@@ -381,14 +377,22 @@ call it with the value of the `gnus-data' text property."
 (defun gnus-xmas-define ()
   (setq gnus-mouse-2 [button2])
 
-  (or (memq 'underline (face-list))
-      (and (fboundp 'make-face)
-	   (funcall (intern "make-face") 'underline)))
+  (unless (memq 'underline (face-list))
+    (and (fboundp 'make-face)
+	 (funcall (intern "make-face") 'underline)))
   ;; Must avoid calling set-face-underline-p directly, because it
   ;; is a defsubst in emacs19, and will make the .elc files non
   ;; portable!
-  (or (face-differs-from-default-p 'underline)
-      (funcall (intern "set-face-underline-p") 'underline t))
+  (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.
+    (fset 'gnus-characterp 'char-or-char-int-p))
+   ;; V19 of XEmacs, probably.
+   (t
+    (fset 'gnus-characterp 'characterp)))
 
   (fset 'gnus-make-overlay 'make-extent)
   (fset 'gnus-overlay-put 'set-extent-property)
@@ -397,12 +401,17 @@ call it with the value of the `gnus-data' text property."
   (fset 'gnus-extent-detached-p 'extent-detached-p)
   (fset 'gnus-add-text-properties 'gnus-xmas-add-text-properties)
   (fset 'gnus-put-text-property 'gnus-xmas-put-text-property)
-      
+
   (require 'text-props)
-  (if (< emacs-minor-version 14)
+  (if (and (<= emacs-major-version 19)
+ 	   (< emacs-minor-version 14))
       (fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
 
-  (or (boundp 'standard-display-table) (setq standard-display-table nil))
+  (when (fboundp 'turn-off-scroll-in-place)
+    (add-hook 'gnus-article-mode-hook 'turn-off-scroll-in-place))
+
+  (unless (boundp 'standard-display-table)
+    (setq standard-display-table nil))
 
   (defvar gnus-mouse-face-prop 'highlight)
 
@@ -410,98 +419,55 @@ call it with the value of the `gnus-data' text property."
     (defun encode-time (sec minute hour day month year &optional zone)
       (let ((seconds
 	     (gnus-xmas-seconds-since-epoch
-	      (timezone-make-arpa-date 
+	      (timezone-make-arpa-date
 	       year month day (timezone-make-time-string hour minute sec)
 	       zone))))
 	(list (floor (/ seconds (expt 2 16)))
 	      (round (mod seconds (expt 2 16)))))))
-      
+
   (defun gnus-byte-code (func)
     "Return a form that can be `eval'ed based on FUNC."
     (let ((fval (symbol-function func)))
       (if (compiled-function-p fval)
 	  (list 'funcall fval)
 	(cons 'progn (cdr (cdr fval))))))
-      
-  ;; Fix by "jeff (j.d.) sparkes" <jsparkes@bnr.ca>.
-  (defvar gnus-display-type (device-class)
-    "A symbol indicating the display Emacs is running under.
-The symbol should be one of `color', `grayscale' or `mono'. If Emacs
-guesses this display attribute wrongly, either set this variable in
-your `~/.emacs' or set the resource `Emacs.displayType' in your
-`~/.Xdefaults'. See also `gnus-background-mode'.
-
-This is a meta-variable that will affect what default values other
-variables get.  You would normally not change this variable, but
-pounce directly on the real variables themselves.")
 
-
-  (fset 'gnus-x-color-values 
+  (fset 'gnus-x-color-values
 	(if (fboundp 'x-color-values)
 	    'x-color-values
 	  (lambda (color)
 	    (color-instance-rgb-components
-	     (make-color-instance color)))))
-    
-  (defvar gnus-background-mode 
-    (let* ((bg-resource 
-	    (condition-case ()
-		(x-get-resource ".backgroundMode" "BackgroundMode" 'string)
-	      (error nil)))
-	   (params (frame-parameters))
-	   (color (condition-case ()
-		      (or (assq 'background-color params)
-			  (color-instance-name
-			   (specifier-instance
-			    (face-background 'default))))
-		    (error nil))))
-      (cond (bg-resource (intern (downcase bg-resource)))
-	    ((and color
-		  (< (apply '+ (gnus-x-color-values color))
-		     (/ (apply '+ (gnus-x-color-values "white")) 3)))
-	     'dark)
-	    (t 'light)))
-    "A symbol indicating the Emacs background brightness.
-The symbol should be one of `light' or `dark'.
-If Emacs guesses this frame attribute wrongly, either set this variable in
-your `~/.emacs' or set the resource `Emacs.backgroundMode' in your
-`~/.Xdefaults'.
-See also `gnus-display-type'.
-
-This is a meta-variable that will affect what default values other
-variables get.  You would normally not change this variable, but
-pounce directly on the real variables themselves.")
-  )
-
-
+	     (make-color-instance color))))))
 
 (defun gnus-xmas-redefine ()
   "Redefine lots of Gnus functions for XEmacs."
   (fset 'gnus-summary-make-display-table 'ignore)
   (fset 'gnus-visual-turn-off-edit-menu 'identity)
-  (fset 'gnus-highlight-selected-summary
-	'gnus-xmas-highlight-selected-summary)
   (fset 'gnus-summary-recenter 'gnus-xmas-summary-recenter)
   (fset 'gnus-extent-start-open 'gnus-xmas-extent-start-open)
-  (fset 'gnus-copy-article-buffer 'gnus-xmas-copy-article-buffer)
   (fset 'gnus-article-push-button 'gnus-xmas-article-push-button)
   (fset 'gnus-article-add-button 'gnus-xmas-article-add-button)
   (fset 'gnus-window-top-edge 'gnus-xmas-window-top-edge)
   (fset 'gnus-read-event-char 'gnus-xmas-read-event-char)
   (fset 'gnus-group-startup-message 'gnus-xmas-group-startup-message)
   (fset 'gnus-tree-minimize 'gnus-xmas-tree-minimize)
-  (fset 'gnus-appt-select-lowest-window 
+  (fset 'gnus-appt-select-lowest-window
 	'gnus-xmas-appt-select-lowest-window)
   (fset 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names)
-  (fset 'gnus-make-local-hook 'make-local-variable)
   (fset 'gnus-add-hook 'gnus-xmas-add-hook)
   (fset 'gnus-character-to-event 'character-to-event)
+  (fset 'gnus-mode-line-buffer-identification
+	'gnus-xmas-mode-line-buffer-identification)
+  (fset 'gnus-key-press-event-p 'key-press-event-p)
+  (fset 'gnus-region-active-p 'region-active-p)
 
   (add-hook 'gnus-group-mode-hook 'gnus-xmas-group-menu-add)
   (add-hook 'gnus-summary-mode-hook 'gnus-xmas-summary-menu-add)
   (add-hook 'gnus-article-mode-hook 'gnus-xmas-article-menu-add)
+  (add-hook 'gnus-score-mode-hook 'gnus-xmas-score-menu-add)
 
   (add-hook 'gnus-pick-mode-hook 'gnus-xmas-pick-menu-add)
+  (add-hook 'gnus-topic-mode-hook 'gnus-xmas-topic-menu-add)
   (add-hook 'gnus-tree-mode-hook 'gnus-xmas-tree-menu-add)
   (add-hook 'gnus-binary-mode-hook 'gnus-xmas-binary-menu-add)
   (add-hook 'gnus-grouplens-mode-hook 'gnus-xmas-grouplens-menu-add)
@@ -511,12 +477,21 @@ pounce directly on the real variables themselves.")
   (add-hook 'gnus-group-mode-hook 'gnus-xmas-setup-group-toolbar)
   (add-hook 'gnus-summary-mode-hook 'gnus-xmas-setup-summary-toolbar)
 
+  (add-hook 'gnus-summary-mode-hook 'gnus-xmas-switch-horizontal-scrollbar-off)
+
   (when (and (<= emacs-major-version 19)
 	     (<= emacs-minor-version 13))
+    (setq gnus-article-x-face-too-ugly (when (eq (device-type) 'tty)
+					 "."))
+    (fset 'gnus-highlight-selected-summary
+	  'gnus-xmas-highlight-selected-summary)
     (fset 'gnus-group-remove-excess-properties
 	  'gnus-xmas-group-remove-excess-properties)
     (fset 'gnus-topic-remove-excess-properties
-	  'gnus-xmas-topic-remove-excess-properties)))
+	  'gnus-xmas-topic-remove-excess-properties)
+    (fset 'gnus-mode-line-buffer-identification 'identity)
+    (unless (boundp 'shell-command-switch)
+      (setq shell-command-switch "-c"))))
 
 
 ;;; XEmacs logo and toolbar.
@@ -527,11 +502,11 @@ pounce directly on the real variables themselves.")
   (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
   (erase-buffer)
   (let ((logo (and gnus-xmas-glyph-directory
-		   (concat 
+		   (concat
 		    (file-name-as-directory gnus-xmas-glyph-directory)
 		    "gnus."
 		    (if (featurep 'xpm) "xpm" "xbm"))))
-	(xpm-color-symbols 
+	(xpm-color-symbols
 	 (and (featurep 'xpm)
 	      (append `(("thing" ,(car gnus-xmas-logo-colors))
 			("shadow" ,(cadr gnus-xmas-logo-colors)))
@@ -557,28 +532,28 @@ pounce directly on the real variables themselves.")
 
       (insert
        (format "              %s
-          _    ___ _             _      
-          _ ___ __ ___  __    _ ___     
-          __   _     ___    __  ___     
-              _           ___     _     
-             _  _ __             _      
-             ___   __            _      
-                   __           _       
-                    _      _   _        
-                   _      _    _        
-                      _  _    _         
-                  __  ___               
-                 _   _ _     _          
-                _   _                   
-              _    _                    
-             _    _                     
-            _                         
-          __                             
-
-" 
+          _    ___ _             _
+          _ ___ __ ___  __    _ ___
+          __   _     ___    __  ___
+              _           ___     _
+             _  _ __             _
+             ___   __            _
+                   __           _
+                    _      _   _
+                   _      _    _
+                      _  _    _
+                  __  ___
+                 _   _ _     _
+                _   _
+              _    _
+             _    _
+            _
+          __
+
+"
 	       ""))
       ;; And then hack it.
-      (gnus-indent-rigidly (point-min) (point-max) 
+      (gnus-indent-rigidly (point-min) (point-max)
 			   (/ (max (- (window-width) (or x 46)) 0) 2))
       (goto-char (point-min))
       (forward-line 1)
@@ -588,13 +563,11 @@ pounce directly on the real variables themselves.")
 	(insert (make-string (max 0 (* 2 (/ rest 3))) ?\n))))
     ;; Fontify some.
     (goto-char (point-min))
-    (and (search-forward "Praxis" nil t)
-	 (put-text-property (match-beginning 0) (match-end 0) 'face 'bold))
+    (put-text-property (point-min) (point-max) 'face 'gnus-splash-face)
     (goto-char (point-min))
-    (let* ((mode-string (gnus-group-set-mode-line)))
-      (setq modeline-buffer-identification 
-	    (list (concat gnus-version (substring (car mode-string) 4))))
-      (set-buffer-modified-p t))))
+    (setq modeline-buffer-identification
+	  (list (concat gnus-version ": *Group*")))
+    (set-buffer-modified-p t)))
 
 
 ;;; The toolbar.
@@ -607,36 +580,36 @@ If it is non-nil, it must be a toolbar.  The five legal values are
 `default-toolbar', `top-toolbar', `bottom-toolbar',
 `right-toolbar', and `left-toolbar'.")
 
-(defvar gnus-group-toolbar 
-  '(
-    [gnus-group-get-new-news gnus-group-get-new-news t "Get new news"]
-    [gnus-group-get-new-news-this-group 
+(defvar gnus-group-toolbar
+  '([gnus-group-get-new-news gnus-group-get-new-news t "Get new news"]
+    [gnus-group-get-new-news-this-group
      gnus-group-get-new-news-this-group t "Get new news in this group"]
-    [gnus-group-catchup-current 
+    [gnus-group-catchup-current
      gnus-group-catchup-current t "Catchup group"]
-    [gnus-group-describe-group 
+    [gnus-group-describe-group
      gnus-group-describe-group t "Describe group"]
+    [gnus-group-unsubscribe gnus-group-unsubscribe t "Unsubscribe group"]
+    [gnus-group-subscribe gnus-group-subscribe t "Subscribe group"]
     [gnus-group-kill-group gnus-group-kill-group t "Kill group"]
     [gnus-group-exit gnus-group-exit t "Exit Gnus"]
     )
   "The group buffer toolbar.")
 
-(defvar gnus-summary-toolbar 
-  '(
-    [gnus-summary-prev-unread 
+(defvar gnus-summary-toolbar
+  '([gnus-summary-prev-unread
      gnus-summary-prev-unread-article t "Prev unread article"]
-    [gnus-summary-next-unread 
+    [gnus-summary-next-unread
      gnus-summary-next-unread-article t "Next unread article"]
-    [gnus-summary-post-news 
+    [gnus-summary-post-news
      gnus-summary-post-news t "Post an article"]
     [gnus-summary-followup-with-original
-     gnus-summary-followup-with-original t 
+     gnus-summary-followup-with-original t
      "Post a followup and yank the original"]
-    [gnus-summary-followup 
+    [gnus-summary-followup
      gnus-summary-followup t "Post a followup"]
     [gnus-summary-reply-with-original
      gnus-summary-reply-with-original t "Mail a reply and yank the original"]
-    [gnus-summary-reply 
+    [gnus-summary-reply
      gnus-summary-reply t "Mail a reply"]
     [gnus-summary-caesar-message
      gnus-summary-caesar-message t "Rot 13"]
@@ -646,23 +619,26 @@ If it is non-nil, it must be a toolbar.  The five legal values are
      gnus-summary-save-article-file t "Save article in file"]
     [gnus-summary-save-article
      gnus-summary-save-article t "Save article"]
-    [gnus-uu-post-news 
+    [gnus-uu-post-news
      gnus-uu-post-news t "Post an uuencoded article"]
     [gnus-summary-cancel-article
      gnus-summary-cancel-article t "Cancel article"]
+    [gnus-summary-catchup
+     gnus-summary-catchup t "Catchup"]
     [gnus-summary-catchup-and-exit
      gnus-summary-catchup-and-exit t "Catchup and exit"]
+    [gnus-summary-exit gnus-summary-exit t "Exit this summary"]
     )
   "The summary buffer toolbar.")
 
 (defvar gnus-summary-mail-toolbar
   '(
-    [gnus-summary-prev-unread 
+    [gnus-summary-prev-unread
      gnus-summary-prev-unread-article t "Prev unread article"]
-    [gnus-summary-next-unread 
+    [gnus-summary-next-unread
      gnus-summary-next-unread-article t "Next unread article"]
     [gnus-summary-mail-reply gnus-summary-reply t "Reply"]
-    [gnus-summary-mail-get gnus-mail-get t "Message get"]
+;    [gnus-summary-mail-get gnus-mail-get t "Message get"]
     [gnus-summary-mail-originate gnus-summary-post-news t "Originate"]
     [gnus-summary-mail-save gnus-summary-save-article t "Save"]
     [gnus-summary-mail-copy gnus-summary-copy-article t "Copy message"]
@@ -678,26 +654,25 @@ If it is non-nil, it must be a toolbar.  The five legal values are
      gnus-summary-save-article-file t "Save article in file"]
     [gnus-summary-save-article
      gnus-summary-save-article t "Save article"]
+    [gnus-summary-catchup
+     gnus-summary-catchup t "Catchup"]
     [gnus-summary-catchup-and-exit
      gnus-summary-catchup-and-exit t "Catchup and exit"]
+    [gnus-summary-exit gnus-summary-exit t "Exit this summary"]
     )
   "The summary buffer mail toolbar.")
 
 (defun gnus-xmas-setup-group-toolbar ()
-  (let (dir)
-    (and gnus-use-toolbar
-	 (setq dir (message-xmas-setup-toolbar gnus-group-toolbar nil "gnus"))
-	 (file-exists-p (concat dir "gnus-group-catchup-current-up.xpm"))
-	 (set-specifier (symbol-value gnus-use-toolbar)
-			(cons (current-buffer) gnus-group-toolbar)))))
+  (and gnus-use-toolbar
+       (message-xmas-setup-toolbar gnus-group-toolbar nil "gnus")
+       (set-specifier (symbol-value gnus-use-toolbar)
+		      (cons (current-buffer) gnus-group-toolbar))))
 
 (defun gnus-xmas-setup-summary-toolbar ()
   (let ((bar (if (gnus-news-group-p gnus-newsgroup-name)
-		 gnus-summary-toolbar gnus-summary-mail-toolbar))
-	dir)
+		 gnus-summary-toolbar gnus-summary-mail-toolbar)))
     (and gnus-use-toolbar
-	 (setq dir (message-xmas-setup-toolbar bar nil "gnus"))
-	 (file-exists-p (concat dir "gnus-group-catchup-current-up.xpm"))
+	 (message-xmas-setup-toolbar bar nil "gnus")
 	 (set-specifier (symbol-value gnus-use-toolbar)
 			(cons (current-buffer) bar)))))
 
@@ -713,13 +688,18 @@ XEmacs compatibility workaround."
    'call-process-region (point-min) (point-max) command t '(t nil) nil
    args))
 
+(unless (find-face 'gnus-x-face)
+  (copy-face 'default 'gnus-x-face)
+  (set-face-foreground 'gnus-x-face "black")
+  (set-face-background 'gnus-x-face "white"))
+
 (defun gnus-xmas-article-display-xface (beg end)
   "Display any XFace headers in the current article."
   (save-excursion
     (let (xface-glyph)
       (if (featurep 'xface)
 	  (setq xface-glyph
-		(make-glyph (vector 'xface :data 
+		(make-glyph (vector 'xface :data
 				    (concat "X-Face: "
 					    (buffer-substring beg end)))))
 	(let ((cur (current-buffer)))
@@ -734,10 +714,63 @@ XEmacs compatibility workaround."
 	    (setq xface-glyph
 		  (make-glyph
 		   (vector 'xpm :data (buffer-string )))))))
+      (set-glyph-face xface-glyph 'gnus-x-face)
       (goto-char (point-min))
       (re-search-forward "^From:" nil t)
-      (beginning-of-line)
-      (set-extent-begin-glyph 
-       (make-extent (point) (point)) xface-glyph))))
+      (set-extent-begin-glyph
+       (make-extent (point) (1+ (point))) xface-glyph))))
+
+(defvar gnus-xmas-pointer-glyph
+  (progn
+    (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
+    (make-pointer-glyph (concat gnus-xmas-glyph-directory "gnus-pointer."
+				(if (featurep 'xpm) "xpm" "xbm")))))
+
+(defvar gnus-xmas-modeline-left-extent
+  (let ((ext (copy-extent modeline-buffer-id-left-extent)))
+    ;(set-extent-property ext 'pointer gnus-xmas-pointer-glyph)
+    ext))
+
+(defvar gnus-xmas-modeline-right-extent
+  (let ((ext (copy-extent modeline-buffer-id-right-extent)))
+    ;(set-extent-property ext 'pointer gnus-xmas-pointer-glyph)
+    ext))
+
+(defvar gnus-xmas-modeline-glyph
+  (progn
+    (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
+    (let* ((file (concat gnus-xmas-glyph-directory "gnus-pointer."
+			 (if (featurep 'xpm) "xpm" "xbm")))
+	   (glyph (make-glyph file)))
+      (when (and (featurep 'x)
+		 (file-exists-p file))
+	(set-glyph-face glyph 'modeline-buffer-id)
+	(set-glyph-property glyph 'image (cons 'tty "Gnus:"))
+	glyph))))
+
+(defun gnus-xmas-mode-line-buffer-identification (line)
+  (let ((line (car line))
+	chop)
+    (cond
+     ;; This is some weird type of id.
+     ((not (stringp line))
+      (list line))
+     ;; This is non-standard, so we just pass it through.
+     ((not (string-match "^Gnus:" line))
+      (list line))
+     ;; We have a standard line, so we colorize and glyphize it a bit.
+     (t
+      (setq chop (match-end 0))
+      (list
+       (if gnus-xmas-modeline-glyph
+	   (cons gnus-xmas-modeline-left-extent gnus-xmas-modeline-glyph)
+	 (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)))
+
+(provide 'gnus-xmas)
 
 ;;; gnus-xmas.el ends here