X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-xmas.el;h=54b8e8866a905078feedcc1ccf9cd4a667a58414;hb=bd6f313a1adbfcd857da128d61605c93614a0455;hp=cdfe3b5a7e94f7eaa2611b1b0fc9a570ebb1c2c5;hpb=bf9b4cc66a85379d1118de9752c3bf85bba1ec2d;p=gnus diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index cdfe3b5a7..54b8e8866 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -1,7 +1,9 @@ ;;; gnus-xmas.el --- Gnus functions for XEmacs -;; Copyright (C) 1995,96 Free Software Foundation, Inc. -;; Author: Lars Magne Ingebrigtsen +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +;; Free Software Foundation, Inc. + +;; Author: Lars Magne Ingebrigtsen ;; Keywords: news ;; This file is part of GNU Emacs. @@ -25,30 +27,45 @@ ;;; Code: +(eval-when-compile + (autoload 'gnus-active "gnus" nil nil 'macro) + (autoload 'gnus-group-entry "gnus" nil nil 'macro) + (autoload 'gnus-info-level "gnus" nil nil 'macro) + (autoload 'gnus-info-marks "gnus" nil nil 'macro) + (autoload 'gnus-info-method "gnus" nil nil 'macro) + (autoload 'gnus-info-score "gnus" nil nil 'macro)) + (require 'text-props) -(eval-when-compile (require 'cl)) -(defvar menu-bar-mode t) +(defvar menu-bar-mode (featurep 'menubar)) +(require 'messagexmas) +(require 'wid-edit) -(defvar gnus-xmas-glyph-directory nil - "*Directory where Gnus logos and icons are located. +(defgroup gnus-xmas nil + "XEmacsoid support for Gnus" + :group 'gnus) + +(defcustom gnus-xmas-glyph-directory nil + "Directory where Gnus logos and icons are located. If this variable is nil, Gnus will try to locate the directory -automatically.") +automatically." + :type '(choice (const :tag "autodetect" nil) + directory) + :group 'gnus-xmas) -;;; Internal variables. +(unless gnus-xmas-glyph-directory + (unless (setq gnus-xmas-glyph-directory + (message-xmas-find-glyph-directory "gnus")) + (error "Can't find glyph directory. \ +Possibly the `etc' directory has not been installed."))) -(defvar gnus-xmas-logo (make-glyph (make-specifier 'image))) +;;; Internal variables. ;; Don't warn about these undefined variables. -(defvar gnus-group-mode-hook) -(defvar gnus-summary-mode-hook) -(defvar gnus-article-mode-hook) - ;;defined in gnus.el (defvar gnus-active-hashtb) (defvar gnus-article-buffer) (defvar gnus-auto-center-summary) -(defvar gnus-buffer-list) (defvar gnus-current-headers) (defvar gnus-level-killed) (defvar gnus-level-zombie) @@ -84,88 +101,116 @@ automatically.") (defvar gnus-article-treatment-menu) (defvar gnus-mouse-2) (defvar standard-display-table) +(defvar gnus-tree-minimize-window) (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 (and (stringp buffer) (not (setq buffer (get-buffer 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)) + buffer) + nil) buffer start end nil nil 'text-prop) - (add-text-properties start end props buffer))) + (gnus-add-text-properties start end props buffer))) (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))) + +(defcustom 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'." + :type 'boolean + :group 'gnus-xmas) + +(defun gnus-xmas-switch-horizontal-scrollbar-off () + (when (featurep 'scrollbar) + (set-specifier scrollbar-height (cons (current-buffer) 0)))) (defun gnus-xmas-summary-recenter () - (let* ((top (cond ((< (window-height) 4) 0) - ((< (window-height) 7) 1) - (t 2))) - (height (- (window-height) 2)) - (bottom (save-excursion (goto-char (point-max)) - (forward-line (- height)) - (point))) - (window (get-buffer-window (current-buffer)))) - (and - ;; The user has to want it, - gnus-auto-center-summary - ;; the article buffer must be displayed, - (get-buffer-window gnus-article-buffer) - ;; Set the window start to either `bottom', which is the biggest - ;; 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))))))) - -(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 - '(gnus-topic nil gnus-topic-level nil gnus-topic-visible nil)) - (goto-char end))) - -(defun gnus-xmas-topic-remove-excess-properties () - (let ((end (point)) - (beg (progn (forward-line -1) (point)))) - (remove-text-properties beg end '(gnus-group nil)) - (goto-char end))) + "\"Center\" point in the summary window. +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) + (window-displayed-height) + (- (window-height) 2))) + (top (cond ((< height 4) 0) + ((< height 7) 1) + (t (if (numberp gnus-auto-center-summary) + gnus-auto-center-summary + 2)))) + (bottom (save-excursion (goto-char (point-max)) + (forward-line (- height)) + (point))) + (window (get-buffer-window (current-buffer)))) + (when (get-buffer-window gnus-article-buffer) + ;; Only do recentering when the article buffer is displayed, + ;; Set the window start to either `bottom', which is the biggest + ;; possible valid number, or the second line from the top, + ;; whichever is the least. + ;; NOFORCE parameter suggested by Daniel Pittman . + (set-window-start + window (min bottom (save-excursion (forward-line (- top)) (point))) + t)) + ;; Do horizontal recentering while we're at it. + (when (and (get-buffer-window (current-buffer) t) + (not (eq gnus-auto-center-summary 'vertical))) + (let ((selected (selected-window))) + (select-window (get-buffer-window (current-buffer) t)) + (gnus-summary-position-point) + (gnus-horizontal-recenter) + (select-window selected)))))) + +(defun gnus-xmas-summary-set-display-table () + ;; Setup the display table -- like `gnus-summary-setup-display-table', + ;; but done in an XEmacsish way. + (let ((table (make-display-table)) + (i 32)) + ;; Nix out all the control chars... + (while (>= (setq i (1- i)) 0) + (aset table i [??])) + ;; ... but not newline and cr, of course. (cr is necessary for the + ;; selective display). + (aset table ?\n nil) + (aset table ?\r nil) + ;; We keep TAB as well. + (aset table ?\t nil) + ;; We nix out any glyphs over 126 below ctl-arrow. + (let ((i (if (integerp ctl-arrow) ctl-arrow 160))) + (while (>= (setq i (1- i)) 127) + (unless (aref table i) + (aset table i [??])))) + ;; Can't use `set-specifier' because of a bug in 19.14 and earlier + (add-spec-to-specifier current-display-table table (current-buffer) nil))) + +(defun gnus-xmas-add-text-properties (start end props &optional object) + (add-text-properties start end props object) + (put-text-property start end 'start-closed nil object)) + +(defun gnus-xmas-put-text-property (start end prop value &optional object) + (put-text-property start end prop value object) + (put-text-property start end 'start-closed nil object)) (defun gnus-xmas-extent-start-open (point) (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)))))) (defun gnus-xmas-article-push-button (event) "Check text under the mouse pointer for a callback function. @@ -176,25 +221,18 @@ 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)))) + (goto-char pos) + (when fun + (funcall fun data)))) (defun gnus-xmas-move-overlay (extent start end &optional buffer) - (set-extent-endpoints extent start end)) - -;; Fixed by Christopher Davis . -(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)) - (add-text-properties - from to - (nconc - (and gnus-article-mouse-face - (list 'mouse-face gnus-article-mouse-face)) - (list 'gnus-callback fun) - (and data (list 'gnus-data data)) - (list 'highlight t)))) + (set-extent-endpoints extent start end buffer)) + +(defun gnus-xmas-kill-all-overlays () + "Delete all extents in the current buffer." + (map-extents (lambda (extent ignore) + (delete-extent extent) + nil))) (defun gnus-xmas-window-top-edge (&optional window) (nth 1 (window-pixel-edges window))) @@ -221,495 +259,647 @@ call it with the value of the `gnus-data' text property." (defun gnus-xmas-appt-select-lowest-window () (let* ((lowest-window (selected-window)) (bottom-edge (car (cdr (cdr (cdr (window-pixel-edges)))))) - (last-window (previous-window)) - (window-search t)) + (last-window (previous-window)) + (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) + (when (eq last-window this-window) + (select-window lowest-window) + (setq window-search nil)))))) - (select-window this-window) - (if (eq last-window this-window) - (progn - (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) + +(defun gnus-xmas-menu-add-1 (type menus) + (when (and menu-bar-mode + (gnus-visual-p (intern (format "%s-menu" type)) 'menu)) + (while menus + (easy-menu-add (symbol-value (pop menus)))))) (defun gnus-xmas-group-menu-add () - (easy-menu-add gnus-group-reading-menu) - (easy-menu-add gnus-group-group-menu) - (easy-menu-add gnus-group-misc-menu)) + (gnus-xmas-menu-add group + gnus-group-reading-menu gnus-group-group-menu gnus-group-misc-menu)) (defun gnus-xmas-summary-menu-add () - (easy-menu-add gnus-summary-article-menu) - (easy-menu-add gnus-summary-thread-menu) - (easy-menu-add gnus-summary-misc-menu) - (easy-menu-add gnus-summary-post-menu) - (easy-menu-add gnus-summary-kill-menu)) + (gnus-xmas-menu-add summary + gnus-summary-misc-menu gnus-summary-kill-menu + gnus-summary-article-menu gnus-summary-thread-menu + gnus-summary-post-menu )) (defun gnus-xmas-article-menu-add () - (easy-menu-add gnus-article-article-menu) - (easy-menu-add gnus-article-treatment-menu)) + (gnus-xmas-menu-add article + gnus-article-article-menu gnus-article-treatment-menu + gnus-article-post-menu gnus-article-commands-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-read-event-char () +(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)) + +(defun gnus-xmas-agent-summary-menu-add () + (gnus-xmas-menu-add agent-summary + gnus-agent-summary-menu)) + +(defun gnus-xmas-agent-group-menu-add () + (gnus-xmas-menu-add agent-group + gnus-agent-group-menu)) + +(defun gnus-xmas-agent-server-menu-add () + (gnus-xmas-menu-add agent-server + gnus-agent-server-menu)) + +(defun gnus-xmas-tree-menu-add () + (gnus-xmas-menu-add tree + gnus-tree-menu)) + +(defun gnus-xmas-draft-menu-add () + (gnus-xmas-menu-add draft + gnus-draft-menu)) + +(defun gnus-xmas-server-menu-add () + (gnus-xmas-menu-add menu + gnus-server-server-menu gnus-server-connections-menu)) + +(defun gnus-xmas-browse-menu-add () + (gnus-xmas-menu-add browse + gnus-browse-menu)) + +(defun gnus-xmas-grouplens-menu-add () + (gnus-xmas-menu-add grouplens + gnus-grouplens-menu)) + +(defun gnus-xmas-read-event-char (&optional prompt) "Get the next event." - (let ((event (next-event))) + (when prompt + (message "%s" prompt)) + (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-seconds-since-epoch (date) - "Return a floating point number that says how many seconds have lapsed between Jan 1 12:00:00 1970 and DATE." - (let* ((tdate (mapcar (lambda (ti) (and ti (string-to-int ti))) - (timezone-parse-date date))) - (ttime (mapcar (lambda (ti) (and ti (string-to-int ti))) - (timezone-parse-time - (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 - (nth 1 tdate) (nth 2 tdate) (nth 0 tdate)) - (timezone-absolute-from-gregorian - (nth 1 edate) (nth 2 edate) (nth 0 edate))))) - (+ (nth 2 ttime) - (* (nth 1 ttime) 60) - (* (float (nth 0 ttime)) 60 60) - (* (float tday) 60 60 24)))) - (defun gnus-xmas-define () (setq gnus-mouse-2 [button2]) + (setq gnus-mouse-3 [button3]) + (setq gnus-widget-button-keymap widget-button-keymap) - (or (memq 'underline (list-faces)) - (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)) - - (fset 'gnus-make-overlay 'make-extent) - (fset 'gnus-overlay-put 'set-extent-property) - (fset 'gnus-move-overlay 'gnus-xmas-move-overlay) - (fset 'gnus-overlay-end 'extent-end-position) - (fset 'gnus-extent-detached-p 'extent-detached-p) - - (require 'text-props) - (if (< emacs-minor-version 14) - (fset 'set-text-properties 'gnus-xmas-set-text-properties)) - - (fset 'nnheader-find-file-noselect 'gnus-xmas-find-file-noselect) - - (or (boundp 'standard-display-table) (setq standard-display-table nil)) + (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 'make-extent) + (defalias 'gnus-delete-overlay 'delete-extent) + (defalias 'gnus-overlay-put 'set-extent-property) + (defalias 'gnus-move-overlay 'gnus-xmas-move-overlay) + (defalias 'gnus-overlay-buffer 'extent-object) + (defalias 'gnus-overlay-start 'extent-start-position) + (defalias 'gnus-overlay-end 'extent-end-position) + (defalias 'gnus-kill-all-overlays 'gnus-xmas-kill-all-overlays) + (defalias 'gnus-extent-detached-p 'extent-detached-p) + (defalias 'gnus-add-text-properties 'gnus-xmas-add-text-properties) + (defalias 'gnus-put-text-property 'gnus-xmas-put-text-property) + (defalias 'gnus-deactivate-mark 'ignore) + (defalias 'gnus-window-edges 'window-pixel-edges) + (defalias 'gnus-assq-delete-all 'gnus-xmas-assq-delete-all) + + (if (and (<= emacs-major-version 19) + (< emacs-minor-version 14)) + (defalias 'gnus-set-text-properties 'gnus-xmas-set-text-properties)) + + (unless (boundp 'standard-display-table) + (setq standard-display-table nil)) (defvar gnus-mouse-face-prop 'highlight) - (unless (fboundp 'encode-time) - (defun encode-time (sec minute hour day month year &optional zone) - (let ((seconds - (gnus-xmas-seconds-since-epoch - (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 (byte-code-function-p fval) + (let ((fval (indirect-function func))) + (if (compiled-function-p fval) (list 'funcall fval) (cons 'progn (cdr (cdr fval)))))) - - ;; Fix by "jeff (j.d.) sparkes" . - (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.") - - - (or (fboundp 'x-color-values) - (fset '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))) - (cond (bg-resource (intern (downcase bg-resource))) - ((and (assq 'background-color params) - (< (apply '+ (x-color-values - (cdr (assq 'background-color params)))) - (/ (apply '+ (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.") - ) + (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)))))) (defun gnus-xmas-redefine () "Redefine lots of Gnus functions for XEmacs." - (fset 'gnus-summary-make-display-table (lambda () nil)) - (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-group-remove-excess-properties - 'gnus-xmas-group-remove-excess-properties) - (fset 'gnus-topic-remove-excess-properties - 'gnus-xmas-topic-remove-excess-properties) - (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 'set-text-properties 'gnus-xmas-set-text-properties) - (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) - - (or (fboundp 'appt-select-lowest-window) - (fset 'appt-select-lowest-window - 'gnus-xmas-appt-select-lowest-window)) - - (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-group-mode-hook 'gnus-xmas-setup-group-toolbar) - (add-hook 'gnus-summary-mode-hook 'gnus-xmas-setup-summary-toolbar)) + (defalias 'gnus-summary-set-display-table 'gnus-xmas-summary-set-display-table) + (defalias 'gnus-visual-turn-off-edit-menu 'identity) + (defalias 'gnus-summary-recenter 'gnus-xmas-summary-recenter) + (defalias 'gnus-extent-start-open 'gnus-xmas-extent-start-open) + (defalias 'gnus-article-push-button 'gnus-xmas-article-push-button) + (defalias 'gnus-window-top-edge 'gnus-xmas-window-top-edge) + (defalias 'gnus-read-event-char 'gnus-xmas-read-event-char) + (defalias 'gnus-group-startup-message 'gnus-xmas-group-startup-message) + (defalias 'gnus-tree-minimize 'gnus-xmas-tree-minimize) + (defalias 'gnus-appt-select-lowest-window + 'gnus-xmas-appt-select-lowest-window) + (defalias 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names) + (defalias 'gnus-character-to-event 'character-to-event) + (defalias 'gnus-mode-line-buffer-identification + 'gnus-xmas-mode-line-buffer-identification) + (defalias 'gnus-key-press-event-p 'key-press-event-p) + (defalias 'gnus-region-active-p 'region-active-p) + (defalias 'gnus-mark-active-p 'region-exists-p) + (defalias 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p) + (defalias 'gnus-mime-button-menu 'gnus-xmas-mime-button-menu) + (defalias 'gnus-image-type-available-p 'gnus-xmas-image-type-available-p) + (defalias 'gnus-put-image 'gnus-xmas-put-image) + (defalias 'gnus-create-image 'gnus-xmas-create-image) + (defalias 'gnus-remove-image 'gnus-xmas-remove-image) + + (when (or (< emacs-major-version 21) + (and (= emacs-major-version 21) + (< emacs-minor-version 3))) + (defalias 'gnus-completing-read 'gnus-xmas-completing-read)) + + ;; These ones are not defcutom'ed, sometimes not even defvar'ed. They + ;; probably should. If that is done, the code below should then be moved + ;; where each variable is defined, in order not to mess with user settings. + ;; -- didier + (add-hook 'gnus-score-mode-hook 'gnus-xmas-score-menu-add) + (add-hook 'gnus-binary-mode-hook 'gnus-xmas-binary-menu-add) + (add-hook 'gnus-grouplens-mode-hook 'gnus-xmas-grouplens-menu-add) + (add-hook 'gnus-server-mode-hook 'gnus-xmas-server-menu-add) + (add-hook 'gnus-browse-mode-hook 'gnus-xmas-browse-menu-add) + (add-hook 'gnus-draft-mode-hook 'gnus-xmas-draft-menu-add) + (add-hook 'gnus-mailing-list-mode-hook 'gnus-xmas-mailing-list-menu-add)) ;;; XEmacs logo and toolbar. -(defun gnus-xmas-find-glyph-directory () - (or gnus-xmas-glyph-directory ; We have a dir already... - (let ((path load-path) - dir) - ;; We try to find the dir by looking at the load path, - ;; stripping away the last component and adding "etc/". - (while path - (setq dir (concat - (file-name-directory (directory-file-name (car path))) - "etc/gnus/")) - (if (and (file-exists-p dir) - (file-directory-p dir) - (file-exists-p (concat dir "gnus-group-exit-icon-up.xpm"))) - (setq gnus-xmas-glyph-directory dir - path nil) - (setq path (cdr path)))) - gnus-xmas-glyph-directory))) - (defun gnus-xmas-group-startup-message (&optional x y) "Insert startup message in current buffer." ;; Insert the message. - (gnus-xmas-find-glyph-directory) (erase-buffer) - (let ((file (and gnus-xmas-glyph-directory - (concat - (file-name-as-directory gnus-xmas-glyph-directory) - "gnus.xpm")))) - (if (and (featurep 'xpm) - (not (equal (device-type) 'tty)) - file (file-exists-p file)) - (progn - (set-glyph-property gnus-xmas-logo 'image file) - (set-glyph-image gnus-xmas-logo file 'global 'x) - - (insert " ") - (set-extent-begin-glyph (make-extent (point) (point)) gnus-xmas-logo) - (goto-char (point-min)) - (while (not (eobp)) - (insert (make-string (/ (max (- (window-width) (or x 35)) 0) 2) - ? )) - (forward-line 1)) - (goto-char (point-min)) - (let* ((pheight (+ 20 (count-lines (point-min) (point-max)))) - (wheight (window-height)) - (rest (- wheight pheight))) - (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n)))) - - (insert - (format " %s - _ ___ _ _ - _ ___ __ ___ __ _ ___ - __ _ ___ __ ___ - _ ___ _ - _ _ __ _ - ___ __ _ - __ _ - _ _ _ - _ _ _ - _ _ _ - __ ___ - _ _ _ _ - _ _ - _ _ - _ _ - _ - __ - -" - "")) - ;; And then hack it. - (gnus-indent-rigidly (point-min) (point-max) - (/ (max (- (window-width) (or x 46)) 0) 2)) + (cond + ((and (console-on-window-system-p) + (or (featurep 'xpm) + (featurep 'xbm))) + (let* ((logo-xpm (expand-file-name "gnus.xpm" gnus-xmas-glyph-directory)) + (logo-xbm (expand-file-name "gnus.xbm" gnus-xmas-glyph-directory)) + (glyph (make-glyph + (cond ((featurep 'xpm) + `[xpm + :file ,logo-xpm + :color-symbols + (("thing" . ,(car gnus-logo-colors)) + ("shadow" . ,(cadr gnus-logo-colors)) + ("oort" . "#eeeeee") + ("background" . ,(face-background 'default)))]) + ((featurep 'xbm) + `[xbm :file ,logo-xbm]) + (t [nothing]))))) + (insert " ") + (set-extent-begin-glyph (make-extent (point) (point)) glyph) (goto-char (point-min)) - (forward-line 1) - (let* ((pheight (count-lines (point-min) (point-max))) - (wheight (window-height)) - (rest (- wheight pheight))) - (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n)))) - ;; Fontify some. + (while (not (eobp)) + (insert (make-string (/ (max (- (window-width) (or x 35)) 0) 2) + ?\ )) + (forward-line 1)) + (setq gnus-simple-splash nil)) (goto-char (point-min)) - (and (search-forward "Praxis" nil t) - (put-text-property (match-beginning 0) (match-end 0) 'face 'bold)) + (let* ((pheight (+ 20 (count-lines (point-min) (point-max)))) + (wheight (window-height)) + (rest (- wheight pheight))) + (insert (make-string (max 0 (* 2 (/ rest 3))) ?\n)))) + (t + (insert + (format " %s + _ ___ _ _ + _ ___ __ ___ __ _ ___ + __ _ ___ __ ___ + _ ___ _ + _ _ __ _ + ___ __ _ + __ _ + _ _ _ + _ _ _ + _ _ _ + __ ___ + _ _ _ _ + _ _ + _ _ + _ _ + _ + __ + +" + "")) + ;; And then hack it. + (gnus-indent-rigidly (point-min) (point-max) + (/ (max (- (window-width) (or x 46)) 0) 2)) (goto-char (point-min)) - (let* ((mode-string (gnus-group-set-mode-line))) - (setq mode-line-buffer-identification - (list (concat gnus-version (substring (car mode-string) 4)))) - (set-buffer-modified-p t)))) + (forward-line 1) + (let* ((pheight (count-lines (point-min) (point-max))) + (wheight (window-height)) + (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))) + (setq modeline-buffer-identification + (list (concat gnus-version ": *Group*"))) + (set-buffer-modified-p t)) ;;; The toolbar. -(defvar gnus-use-toolbar 'default-toolbar +(defcustom gnus-use-toolbar (if (featurep 'toolbar) + 'default-toolbar + nil) "*If nil, do not use a toolbar. -If it is non-nil, it must be a toolbar. The five legal values are +If it is non-nil, it must be a toolbar. The five valid values are `default-toolbar', `top-toolbar', `bottom-toolbar', -`right-toolbar', and `left-toolbar'.") - -(defvar gnus-group-toolbar - '([gnus-group-exit-icon gnus-group-exit t "Exit Gnus"] - [gnus-group-kill-group-icon gnus-group-kill-group t "Kill group"] - [gnus-group-get-new-news-icon gnus-group-get-new-news t "Get new news"] - [gnus-group-get-new-news-this-group-icon +`right-toolbar', and `left-toolbar'." + :type '(choice (const default-toolbar) + (const top-toolbar) (const bottom-toolbar) + (const left-toolbar) (const right-toolbar) + (const :tag "no toolbar" nil)) + :group 'gnus-xmas) + +(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-icon + [gnus-group-catchup-current gnus-group-catchup-current t "Catchup group"] - [gnus-group-describe-group-icon - gnus-group-describe-group t "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-summary-mail-save + gnus-group-save-newsrc t "Save .newsrc files"] ; borrowed icon. + [gnus-group-exit gnus-group-exit t "Exit Gnus"]) "The group buffer toolbar.") -(defvar gnus-summary-toolbar - '([gnus-summary-post-news-icon +(defvar gnus-summary-toolbar + '([gnus-summary-prev-unread + gnus-summary-prev-page-or-article t "Page up"] + [gnus-summary-next-unread + gnus-summary-next-page t "Page down"] + [gnus-summary-post-news gnus-summary-post-news t "Post an article"] - [gnus-summary-save-article-file-icon - gnus-summary-save-article-file t "Save article in file"] - [gnus-summary-save-article-icon - gnus-summary-save-article t "Save article"] - [gnus-summary-reply-icon - gnus-summary-reply t "Mail a reply"] - [gnus-summary-reply-with-original-icon - gnus-summary-reply-with-original t "Mail a reply and yank the original"] - [gnus-summary-followup-icon - gnus-summary-followup t "Post a followup"] - [gnus-summary-followup-with-original-icon - gnus-summary-followup-with-original t + [gnus-summary-followup-with-original + gnus-summary-followup-with-original t "Post a followup and yank the original"] - [gnus-uu-decode-uu-icon - gnus-uu-decode-uu t "Decode uuencoded articles"] - [gnus-uu-post-news-icon - gnus-uu-post-news t "Post an uuencoded article"] - [gnus-summary-caesar-message-icon + [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 t "Mail a reply"] + [gnus-summary-caesar-message gnus-summary-caesar-message t "Rot 13"] - [gnus-summary-cancel-article-icon - gnus-summary-cancel-article t "Cancel article"]) + [gnus-uu-decode-uu + gnus-uu-decode-uu t "Decode uuencoded articles"] + [gnus-summary-save-article-file + 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 t "Post a 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.") -(defun gnus-xmas-setup-toolbar (bar &optional force) - (let ((dir (gnus-xmas-find-glyph-directory)) - icon up down disabled name) - (if (not dir) - () - (if (and (not force) - (boundp (aref (car bar) 0))) - dir - (while bar - (setq icon (aref (car bar) 0) - name (symbol-name icon) - bar (cdr bar)) - (setq up (concat dir name "-up.xpm")) - (setq down (concat dir name "-down.xpm")) - (setq disabled (concat dir name "-disabled.xpm")) - (if (not (file-exists-p up)) - (set icon nil) - (set icon (toolbar-make-button-list - up (and (file-exists-p down) down) - (and (file-exists-p disabled) disabled))))) - dir)))) +(defvar gnus-summary-mail-toolbar + '( + [gnus-summary-prev-unread + gnus-summary-prev-unread-article t "Prev unread article"] + [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-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"] + [gnus-summary-mail-forward gnus-summary-mail-forward t "Forward message"] + [gnus-summary-caesar-message + gnus-summary-caesar-message t "Rot 13"] + [gnus-uu-decode-uu + gnus-uu-decode-uu t "Decode uuencoded articles"] + [gnus-summary-save-article-file + gnus-summary-save-article-file t "Save article in file"] + [gnus-summary-save-article + gnus-summary-save-article t "Save article"] + [gnus-summary-cancel-article ; usenet : cancellation :: mail : deletion. + gnus-summary-delete-article t "Delete message"] + [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 () (and gnus-use-toolbar - (gnus-xmas-setup-toolbar gnus-group-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 () - (and gnus-use-toolbar - (gnus-xmas-setup-toolbar gnus-summary-toolbar) - (set-specifier (symbol-value gnus-use-toolbar) - (cons (current-buffer) gnus-summary-toolbar)))) - -;; Written by Erik Naggum . -;; Saved by Steve Baur . -(defun insert-file-contents-literally (filename &optional visit beg end replace) - "Like `insert-file-contents', q.v., but only reads in the file. -A buffer may be modified in several ways after reading into the buffer due -to advanced Emacs features, such as file-name-handlers, format decoding, -find-file-hooks, etc. - This function ensures that none of these modifications will take place." - (let ( ; (file-name-handler-alist nil) - (format-alist nil) - (after-insert-file-functions nil) - (find-buffer-file-type-function - (if (fboundp 'find-buffer-file-type) - (symbol-function 'find-buffer-file-type) - nil))) - (unwind-protect - (progn - (fset 'find-buffer-file-type (lambda (filename) t)) - (insert-file-contents filename visit beg end replace)) - (if find-buffer-file-type-function - (fset 'find-buffer-file-type find-buffer-file-type-function) - (fmakunbound 'find-buffer-file-type))))) - -(defun gnus-xmas-find-file-noselect (filename &optional nowarn rawfile) - "Read file FILENAME into a buffer and return the buffer. -If a buffer exists visiting FILENAME, return that one, but -verify that the file has not changed since visited or saved. -The buffer is not selected, just returned to the caller." - (setq filename - (abbreviate-file-name - (expand-file-name filename))) - (if (file-directory-p filename) - (if find-file-run-dired - (dired-noselect filename) - (error "%s is a directory." filename)) - (let* ((buf (get-file-buffer filename)) - (truename (abbreviate-file-name (file-truename filename))) - (number (nthcdr 10 (file-attributes truename))) - ;; Find any buffer for a file which has same truename. - (other (and (not buf) - (if (fboundp 'find-buffer-visiting) - (find-buffer-visiting filename) - (get-file-buffer filename)))) - error) - ;; Let user know if there is a buffer with the same truename. - (if other - (progn - (or nowarn - (string-equal filename (buffer-file-name other)) - (message "%s and %s are the same file" - filename (buffer-file-name other))) - ;; Optionally also find that buffer. - (if (or (and (boundp 'find-file-existing-other-name) - find-file-existing-other-name) - find-file-visit-truename) - (setq buf other)))) - (if buf - (or nowarn - (verify-visited-file-modtime buf) - (cond ((not (file-exists-p filename)) - (error "File %s no longer exists!" filename)) - ((yes-or-no-p - (if (string= (file-name-nondirectory filename) - (buffer-name buf)) - (format - (if (buffer-modified-p buf) - "File %s changed on disk. Discard your edits? " - "File %s changed on disk. Reread from disk? ") - (file-name-nondirectory filename)) - (format - (if (buffer-modified-p buf) - "File %s changed on disk. Discard your edits in %s? " - "File %s changed on disk. Reread from disk into %s? ") - (file-name-nondirectory filename) - (buffer-name buf)))) - (save-excursion - (set-buffer buf) - (revert-buffer t t))))) - (save-excursion -;;; The truename stuff makes this obsolete. -;;; (let* ((link-name (car (file-attributes filename))) -;;; (linked-buf (and (stringp link-name) -;;; (get-file-buffer link-name)))) -;;; (if (bufferp linked-buf) -;;; (message "Symbolic link to file in buffer %s" -;;; (buffer-name linked-buf)))) - (setq buf (create-file-buffer filename)) - ;; (set-buffer-major-mode buf) - (set-buffer buf) - (erase-buffer) - (if rawfile - (condition-case () - (insert-file-contents-literally filename t) - (file-error - ;; Unconditionally set error - (setq error t))) - (condition-case () - (insert-file-contents filename t) - (file-error - ;; Run find-file-not-found-hooks until one returns non-nil. - (or t ; (run-hook-with-args-until-success 'find-file-not-found-hooks) - ;; If they fail too, set error. - (setq error t))))) - ;; Find the file's truename, and maybe use that as visited name. - (setq buffer-file-truename truename) - (setq buffer-file-number number) - ;; On VMS, we may want to remember which directory in a search list - ;; the file was found in. - (and (eq system-type 'vax-vms) - (let (logical) - (if (string-match ":" (file-name-directory filename)) - (setq logical (substring (file-name-directory filename) - 0 (match-beginning 0)))) - (not (member logical find-file-not-true-dirname-list))) - (setq buffer-file-name buffer-file-truename)) - (if find-file-visit-truename - (setq buffer-file-name - (setq filename - (expand-file-name buffer-file-truename)))) - ;; Set buffer's default directory to that of the file. - (setq default-directory (file-name-directory filename)) - ;; Turn off backup files for certain file names. Since - ;; this is a permanent local, the major mode won't eliminate it. - (and (not (funcall backup-enable-predicate buffer-file-name)) - (progn - (make-local-variable 'backup-inhibited) - (setq backup-inhibited t))) - (if rawfile - nil - (after-find-file error (not nowarn))))) - buf))) - + (let ((bar (if (gnus-news-group-p gnus-newsgroup-name) + gnus-summary-toolbar gnus-summary-mail-toolbar))) + (and gnus-use-toolbar + (message-xmas-setup-toolbar bar nil "gnus") + (set-specifier (symbol-value gnus-use-toolbar) + (cons (current-buffer) bar))))) + +(defun gnus-xmas-mail-strip-quoted-names (address) + "Protect mail-strip-quoted-names from nil input. +XEmacs compatibility workaround." + (if (null address) + nil + (mail-strip-quoted-names address))) + +(defun gnus-xmas-call-region (command &rest args) + (apply + 'call-process-region (point-min) (point-max) command t '(t nil) nil + args)) + +(defvar gnus-xmas-modeline-left-extent + (let ((ext (copy-extent modeline-buffer-id-left-extent))) + ext)) + +(defvar gnus-xmas-modeline-right-extent + (let ((ext (copy-extent modeline-buffer-id-right-extent))) + ext)) + +(defvar gnus-xmas-modeline-glyph + (progn + (let* ((file-xpm (expand-file-name "gnus-pointer.xpm" + gnus-xmas-glyph-directory)) + (file-xbm (expand-file-name "gnus-pointer.xbm" + gnus-xmas-glyph-directory)) + (glyph (make-glyph + ;; Gag gag gag. + (cond ((featurep 'xpm) + ;; Let's try a nifty XPM + `[xpm :file ,file-xpm]) + ((featurep 'xbm) + ;; Then a not-so-nifty XBM + `[xbm :file ,file-xbm]) + ;; Then the simple string + (t [string :data "Gnus:"]))))) + (set-glyph-face glyph 'modeline-buffer-id) + 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))) + +(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) + (eq (cadr (memq 'gnus-undeletable (text-properties-at b))) t) + (text-property-any b e 'gnus-undeletable t)))) + +(defun gnus-xmas-mime-button-menu (event prefix) + "Construct a context-sensitive menu of MIME commands." + (interactive "e\nP") + (let ((response (get-popup-menu-response + `("MIME Part" + ,@(mapcar (lambda (c) `[,(caddr c) ,(car c) t]) + gnus-mime-button-commands))))) + (set-buffer (event-buffer event)) + (goto-char (event-point event)) + (funcall (event-function response) (event-object response)))) + +(defun gnus-group-add-icon () + "Add an icon to the current line according to `gnus-group-icon-list'." + (let* ((p (point)) + (end (gnus-point-at-eol)) + ;; now find out where the line starts and leave point there. + (beg (progn (beginning-of-line) (point)))) + (save-restriction + (narrow-to-region beg end) + (goto-char beg) + (when (search-forward "==&&==" nil t) + (let* ((group (gnus-group-group-name)) + (entry (gnus-group-entry group)) + (unread (if (numberp (car entry)) (car entry) 0)) + (active (gnus-active group)) + (total (if active (1+ (- (cdr active) (car active))) 0)) + (info (nth 2 entry)) + (method (gnus-server-get-method group (gnus-info-method info))) + (marked (gnus-info-marks info)) + (mailp (memq 'mail (assoc (symbol-name + (car (or method gnus-select-method))) + gnus-valid-select-methods))) + (level (or (gnus-info-level info) gnus-level-killed)) + (score (or (gnus-info-score info) 0)) + (ticked (gnus-range-length (cdr (assq 'tick marked)))) + (group-age (gnus-group-timestamp-delta group)) + (inhibit-read-only t) + (list gnus-group-icon-list) + (mystart (match-beginning 0)) + (myend (match-end 0))) + (goto-char (point-min)) + (while (and list + (not (eval (caar list)))) + (setq list (cdr list))) + (if list + (let* ((file (cdar list)) + (glyph (gnus-group-icon-create-glyph + (buffer-substring mystart myend) + file))) + (if glyph + (progn + (mapcar 'delete-annotation (annotations-at myend)) + (let ((ext (make-extent mystart myend)) + (ant (make-annotation glyph myend 'text))) + ;; set text extent params + (set-extent-property ext 'end-open t) + (set-extent-property ext 'start-open t) + (set-extent-property ext 'invisible t))) + (delete-region mystart myend))) + (delete-region mystart myend)))) + (widen)) + (goto-char p))) + +(defun gnus-group-icon-create-glyph (substring pixmap) + "Create a glyph for insertion into a group line." + (or + (cdr-safe (assoc pixmap gnus-group-icon-cache)) + (let* ((glyph (make-glyph + (list + (cons 'x + (expand-file-name pixmap gnus-xmas-glyph-directory)) + (cons 'mswindows + (expand-file-name pixmap gnus-xmas-glyph-directory)) + (cons 'tty substring))))) + (setq gnus-group-icon-cache + (cons (cons pixmap glyph) gnus-group-icon-cache)) + (set-glyph-face glyph 'default) + glyph))) + +(defun gnus-xmas-mailing-list-menu-add () + (gnus-xmas-menu-add mailing-list + gnus-mailing-list-menu)) + +(defun gnus-xmas-image-type-available-p (type) + (and window-system + (featurep (if (eq type 'pbm) 'xbm type)))) + +(defun gnus-xmas-create-image (file &optional type data-p &rest props) + (let ((type (if type + (symbol-name type) + (car (last (split-string file "[.]"))))) + (face (plist-get props :face)) + glyph) + (when (equal type "pbm") + (with-temp-buffer + (if data-p + (insert file) + (insert-file-contents-literally file)) + (shell-command-on-region (point-min) (point-max) + "ppmtoxpm 2>/dev/null" t) + (setq file (buffer-string) + type "xpm" + data-p t))) + (setq glyph + (if (equal type "xbm") + (make-glyph (list (cons 'x file))) + (with-temp-buffer + (if data-p + (insert file) + (insert-file-contents-literally file)) + (make-glyph + (vector + (or (intern type) + (mm-image-type-from-buffer)) + :data (buffer-string)))))) + (when face + (set-glyph-face glyph face)) + glyph)) + +(defun gnus-xmas-put-image (glyph &optional string category) + "Insert STRING, but display GLYPH. +Warning: Don't insert text immediately after the image." + (let ((begin (point)) + extent) + (if (and (bobp) (not string)) + (setq string " ")) + (if string + (insert string) + (setq begin (1- begin))) + (setq extent (make-extent begin (point))) + (set-extent-property extent 'gnus-image category) + (set-extent-property extent 'duplicable t) + (if string + (set-extent-property extent 'invisible t)) + (set-extent-property extent 'end-glyph glyph)) + glyph) + +(defun gnus-xmas-remove-image (image &optional category) + (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) + nil nil nil nil nil 'gnus-image category)) + +(defun gnus-xmas-completing-read (prompt table &optional + predicate require-match history) + (when (and history + (not (boundp history))) + (set history nil)) + (completing-read + (if (symbol-value history) + (concat prompt " (" (car (symbol-value history)) "): ") + (concat prompt ": ")) + table + predicate + require-match + nil + history)) + +;; This macro is because XEmacs versions prior to 21.2 do not have the +;; PROTOCOL argument to `open-network-stream'. +(defmacro gnus-xmas-open-network-stream (name buffer host service &optional protocol) + "Like `open-network-stream' but take into account older XEmacs versions." + (if (and (featurep 'xemacs) + (fboundp 'open-network-stream) + (emacs-version>= 21 2)) + `(open-network-stream ,name ,buffer ,host ,service ,protocol) + `(open-network-stream ,name ,buffer ,host ,service))) + +(defun gnus-xmas-assq-delete-all (key alist) + (let ((elem nil)) + (while (setq elem (assq key alist)) + (setq alist (delq elem alist))) + alist)) + +(provide 'gnus-xmas) ;;; gnus-xmas.el ends here