;;; gnus-xmas.el --- Gnus functions for XEmacs
-;; Copyright (C) 1995,96,97,98,99 Free Software Foundation, Inc.
+
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
+;; Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
directory)
:group 'gnus-xmas)
+(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.")))
+
;;(format "%02x%02x%02x" 114 66 20) "724214"
(defvar gnus-xmas-logo-color-alist
;; 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)
;; whichever is the least.
;; NOFORCE parameter suggested by Daniel Pittman <daniel@danann.net>.
(set-window-start
- window (min bottom (save-excursion (forward-line (- top)) (point)))
+ 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)
(defun gnus-xmas-article-menu-add ()
(gnus-xmas-menu-add article
- gnus-article-article-menu gnus-article-treatment-menu))
+ 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
(cond
((fboundp 'char-or-char-int-p)
;; Handle both types of marks for XEmacs-20.x.
- (fset 'gnus-characterp 'char-or-char-int-p))
+ (defalias 'gnus-characterp 'char-or-char-int-p))
;; V19 of XEmacs, probably.
(t
- (fset 'gnus-characterp 'characterp)))
-
- (fset 'gnus-make-overlay 'make-extent)
- (fset 'gnus-delete-overlay 'delete-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-kill-all-overlays 'gnus-xmas-kill-all-overlays)
- (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)
- (fset 'gnus-deactivate-mark 'ignore)
- (fset 'gnus-window-edges 'window-pixel-edges)
+ (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)
(if (and (<= emacs-major-version 19)
(< emacs-minor-version 14))
- (fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
-
- (when (fboundp 'turn-off-scroll-in-place)
- (add-hook 'gnus-article-mode-hook 'turn-off-scroll-in-place))
+ (defalias 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
(unless (boundp 'standard-display-table)
(setq standard-display-table nil))
(cons 'progn (cdr (cdr fval))))))
(unless (fboundp 'match-string-no-properties)
- (fset 'match-string-no-properties 'match-string))
+ (defalias 'match-string-no-properties 'match-string))
- (fset 'gnus-x-color-values
+ (defalias 'gnus-x-color-values
(if (fboundp 'x-color-values)
'x-color-values
(lambda (color)
(defun gnus-xmas-redefine ()
"Redefine lots of Gnus functions for XEmacs."
- (fset 'gnus-summary-set-display-table 'gnus-xmas-summary-set-display-table)
- (fset 'gnus-visual-turn-off-edit-menu 'identity)
- (fset 'gnus-summary-recenter 'gnus-xmas-summary-recenter)
- (fset 'gnus-extent-start-open 'gnus-xmas-extent-start-open)
- (fset 'gnus-article-push-button 'gnus-xmas-article-push-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
+ (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)
- (fset 'gnus-mail-strip-quoted-names 'gnus-xmas-mail-strip-quoted-names)
- (fset 'gnus-character-to-event 'character-to-event)
- (fset 'gnus-mode-line-buffer-identification
+ (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)
- (fset 'gnus-key-press-event-p 'key-press-event-p)
- (fset 'gnus-region-active-p 'region-active-p)
- (fset 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p)
- (fset 'gnus-mime-button-menu 'gnus-xmas-mime-button-menu)
-
- (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)
+ (defalias 'gnus-key-press-event-p 'key-press-event-p)
+ (defalias 'gnus-region-active-p 'region-active-p)
+ (defalias 'gnus-annotation-in-region-p 'gnus-xmas-annotation-in-region-p)
+ (defalias 'gnus-mime-button-menu 'gnus-xmas-mime-button-menu)
+
+ ;; 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-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)
(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-group-mode-hook 'gnus-xmas-setup-group-toolbar)
- (add-hook 'gnus-summary-mode-hook 'gnus-xmas-setup-summary-toolbar)
-
- (add-hook 'gnus-agent-summary-mode-hook 'gnus-xmas-agent-summary-menu-add)
- (add-hook 'gnus-agent-group-mode-hook 'gnus-xmas-agent-group-menu-add)
- (add-hook 'gnus-agent-server-mode-hook 'gnus-xmas-agent-server-menu-add)
-
(add-hook 'gnus-draft-mode-hook 'gnus-xmas-draft-menu-add)
- (add-hook 'gnus-summary-mode-hook
- 'gnus-xmas-switch-horizontal-scrollbar-off)
- (add-hook 'gnus-tree-mode-hook 'gnus-xmas-switch-horizontal-scrollbar-off))
+ (add-hook 'gnus-mailing-list-mode-hook 'gnus-xmas-mailing-list-menu-add))
;;; XEmacs logo and toolbar.
(defun gnus-xmas-group-startup-message (&optional x y)
"Insert startup message in current buffer."
;; Insert the message.
- (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
(erase-buffer)
(cond
((and (console-on-window-system-p)
"Face to show X face"
:group 'gnus-xmas)
-(defun gnus-xmas-article-display-xface (beg end)
- "Display any XFace headers in the current article."
+(defun gnus-xmas-article-display-xface (beg end &optional buffer)
+ "Display any XFace headers in BUFFER."
(save-excursion
(let ((xface-glyph
(cond
((featurep 'xface)
(make-glyph (vector 'xface :data
(concat "X-Face: "
- (buffer-substring beg end)))))
+ (if buffer
+ (with-current-buffer buffer
+ (buffer-substring beg end))
+ (buffer-substring beg end))))))
((featurep 'xpm)
- (let ((cur (current-buffer)))
+ (let ((cur (or buffer (current-buffer))))
(save-excursion
(gnus-set-work-buffer)
- (insert (format "%s" (buffer-substring beg end cur)))
- (gnus-xmas-call-region "uncompface")
- (goto-char (point-min))
- (insert "/* Width=48, Height=48 */\n")
- (gnus-xmas-call-region "icontopbm")
- (gnus-xmas-call-region "ppmtoxpm")
- (make-glyph
- (vector 'xpm :data (buffer-string))))))
+ (insert-buffer-substring cur beg end)
+ (let ((coding-system-for-read 'binary)
+ (coding-system-for-write 'binary))
+ (gnus-xmas-call-region "uncompface")
+ (goto-char (point-min))
+ (insert "/* Width=48, Height=48 */\n")
+ (gnus-xmas-call-region "icontopbm")
+ (gnus-xmas-call-region "ppmtoxpm")
+ (make-glyph
+ (vector 'xpm :data (buffer-string)))))))
(t
(make-glyph [nothing]))))
(ext (make-extent (progn
(defvar gnus-xmas-modeline-glyph
(progn
- (setq gnus-xmas-glyph-directory (message-xmas-find-glyph-directory "gnus"))
(let* ((file-xpm (expand-file-name "gnus-pointer.xpm"
gnus-xmas-glyph-directory))
(file-xbm (expand-file-name "gnus-pointer.xbm"
(defun gnus-group-icon-create-glyph (substring pixmap)
"Create a glyph for insertion into a group line."
- (and
- gnus-group-running-xemacs
- (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))))
+ (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))
(provide 'gnus-xmas)
projects / gnus / blobdiff