;;; gnus-xmas.el --- Gnus functions for XEmacs
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2005
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
+;; 2005, 2006 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; GNU Emacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
;; any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
(defvar menu-bar-mode (featurep 'menubar))
(require 'messagexmas)
(require 'wid-edit)
-(require 'timer-funcs)
(defgroup gnus-xmas nil
"XEmacsoid support for Gnus"
(t
(defalias 'gnus-characterp 'characterp)))
- (defalias 'gnus-make-overlay 'make-extent)
+ (defalias 'gnus-make-overlay
+ (lambda (beg end &optional buffer front-advance rear-advance)
+ "Create a new overlay with range BEG to END in BUFFER.
+FRONT-ADVANCE and REAR-ADVANCE are ignored."
+ (make-extent beg end buffer)))
+
(defalias 'gnus-delete-overlay 'delete-extent)
(defalias 'gnus-overlay-put 'set-extent-property)
(defalias 'gnus-move-overlay 'gnus-xmas-move-overlay)
(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-mime-security-button-menu
+ 'gnus-xmas-mime-security-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)
((eq major-mode 'gnus-summary-mode)
(gnus-xmas-setup-summary-toolbar)))))))
-(defcustom gnus-use-toolbar
- (if (and (featurep 'toolbar)
- (specifier-instance default-toolbar-visible-p))
- 'default)
+(defcustom gnus-use-toolbar (if (featurep 'toolbar) 'default)
"*Position to display the toolbar. Nil means do not use a toolbar.
If it is non-nil, it should be one of the symbols `default', `top',
`bottom', `right', and `left'. `default' means to use the default
(when (featurep 'toolbar)
(if (and gnus-use-toolbar
(message-xmas-setup-toolbar toolbar nil "gnus"))
- (let* ((bar (or (intern-soft (format "%s-toolbar" gnus-use-toolbar))
- 'default-toolbar))
- (bars (delq bar (list 'top-toolbar 'bottom-toolbar
- 'right-toolbar 'left-toolbar)))
- hw)
- (while bars
- (remove-specifier (symbol-value (pop bars)) (current-buffer)))
- (unless (eq bar 'default-toolbar)
- (set-specifier default-toolbar nil (current-buffer)))
- (set-specifier (symbol-value bar) toolbar (current-buffer))
- (when (setq hw (cdr (assq gnus-use-toolbar
- '((default . default-toolbar-height)
- (top . top-toolbar-height)
- (bottom . bottom-toolbar-height)))))
- (set-specifier (symbol-value hw) (car gnus-toolbar-thickness)
- (current-buffer)))
- (when (setq hw (cdr (assq gnus-use-toolbar
- '((default . default-toolbar-width)
- (right . right-toolbar-width)
- (left . left-toolbar-width)))))
- (set-specifier (symbol-value hw) (cdr gnus-toolbar-thickness)
- (current-buffer))))
- (set-specifier default-toolbar nil (current-buffer))
- (remove-specifier top-toolbar (current-buffer))
- (remove-specifier bottom-toolbar (current-buffer))
- (remove-specifier right-toolbar (current-buffer))
- (remove-specifier left-toolbar (current-buffer)))
- (set-specifier default-toolbar-visible-p t (current-buffer))
- (set-specifier top-toolbar-visible-p t (current-buffer))
- (set-specifier bottom-toolbar-visible-p t (current-buffer))
- (set-specifier right-toolbar-visible-p t (current-buffer))
- (set-specifier left-toolbar-visible-p t (current-buffer))))
+ (let ((bar (or (intern-soft (format "%s-toolbar" gnus-use-toolbar))
+ 'default-toolbar))
+ (height (car gnus-toolbar-thickness))
+ (width (cdr gnus-toolbar-thickness))
+ (cur (current-buffer))
+ bars)
+ (set-specifier (symbol-value bar) toolbar cur)
+ (set-specifier default-toolbar-height height cur)
+ (set-specifier default-toolbar-width width cur)
+ (set-specifier top-toolbar-height height cur)
+ (set-specifier bottom-toolbar-height height cur)
+ (set-specifier right-toolbar-width width cur)
+ (set-specifier left-toolbar-width width cur)
+ (if (eq bar 'default-toolbar)
+ (progn
+ (remove-specifier default-toolbar-visible-p cur)
+ (remove-specifier top-toolbar cur)
+ (remove-specifier top-toolbar-visible-p cur)
+ (remove-specifier bottom-toolbar cur)
+ (remove-specifier bottom-toolbar-visible-p cur)
+ (remove-specifier right-toolbar cur)
+ (remove-specifier right-toolbar-visible-p cur)
+ (remove-specifier left-toolbar cur)
+ (remove-specifier left-toolbar-visible-p cur))
+ (set-specifier (symbol-value (intern (format "%s-visible-p" bar)))
+ t cur)
+ (setq bars (delq bar (list 'default-toolbar
+ 'bottom-toolbar 'top-toolbar
+ 'right-toolbar 'left-toolbar)))
+ (while bars
+ (set-specifier (symbol-value (intern (format "%s-visible-p"
+ (pop bars))))
+ nil cur))))
+ (let ((cur (current-buffer)))
+ (set-specifier default-toolbar-visible-p nil cur)
+ (set-specifier top-toolbar-visible-p nil cur)
+ (set-specifier bottom-toolbar-visible-p nil cur)
+ (set-specifier right-toolbar-visible-p nil cur)
+ (set-specifier left-toolbar-visible-p nil cur)))))
(defun gnus-xmas-setup-group-toolbar ()
(gnus-xmas-setup-toolbar gnus-group-toolbar))
(goto-char (event-point event))
(funcall (event-function response) (event-object response))))
+(defun gnus-xmas-mime-security-button-menu (event prefix)
+ "Construct a context-sensitive menu of security commands."
+ (interactive "e\nP")
+ (let ((response
+ (get-popup-menu-response
+ `("Security Part"
+ ,@(delq nil
+ (mapcar (lambda (c)
+ (unless (eq (car c) 'undefined)
+ `[,(caddr c) ,(car c) t]))
+ gnus-mime-security-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))
file)))
(if glyph
(progn
- (mapcar 'delete-annotation (annotations-at myend))
+ (mapc 'delete-annotation (annotations-at myend))
(let ((ext (make-extent mystart myend))
(ant (make-annotation glyph myend 'text)))
;; set text extent params
gnus-mailing-list-menu))
(defun gnus-xmas-image-type-available-p (type)
- (and window-system
+ (and (if (fboundp 'display-images-p)
+ (display-images-p)
+ window-system)
(featurep (if (eq type 'pbm) 'xbm type))))
(defun gnus-xmas-create-image (file &optional type data-p &rest props)