;;; gnus-xmas.el --- Gnus functions for XEmacs
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1995-2015 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,
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;;; 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)
(defvar menu-bar-mode (featurep 'menubar))
(require 'messagexmas)
(require 'wid-edit)
+(require 'gnus-util)
(defgroup gnus-xmas nil
"XEmacsoid support for Gnus"
(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 (stringp buffer)
- nil
- (map-extents (lambda (extent ignored)
- (remove-text-properties
- start end
- (list (extent-property extent 'text-prop) nil)
- buffer)
- nil)
- buffer start end nil nil 'text-prop)
- (gnus-add-text-properties start end props buffer)))
-
-(defun gnus-xmas-highlight-selected-summary ()
- ;; Highlight selected article in summary buffer
- (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)))
+;;`gnus-agent-mode' in gnus-agent.el will define it.
+(defvar gnus-agent-summary-mode)
+(defvar gnus-draft-mode)
(defcustom gnus-xmas-force-redisplay nil
"*If non-nil, force a redisplay before recentering the summary buffer.
(i 32))
;; Nix out all the control chars...
(while (>= (setq i (1- i)) 0)
- (aset table i [??]))
+ (gnus-put-display-table i [??] table))
;; ... but not newline and cr, of course. (cr is necessary for the
;; selective display).
- (aset table ?\n nil)
- (aset table ?\r nil)
+ (gnus-put-display-table ?\n nil table)
+ (gnus-put-display-table ?\r nil table)
;; We keep TAB as well.
- (aset table ?\t nil)
+ (gnus-put-display-table ?\t nil table)
;; 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 [??]))))
+ (unless (gnus-get-display-table i table)
+ (gnus-put-display-table i [??] table))))
;; 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)))
(when fun
(funcall fun data))))
-(defun gnus-xmas-move-overlay (extent start end &optional buffer)
- (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)
(select-window selected))))))
;; Select the lowest window on the frame.
-(defun gnus-xmas-appt-select-lowest-window ()
+(defun gnus-xmas-select-lowest-window ()
(let* ((lowest-window (selected-window))
(bottom-edge (car (cdr (cdr (cdr (window-pixel-edges))))))
(last-window (previous-window))
(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 ()
+(defun gnus-xmas-read-event-char (&optional prompt)
"Get the next event."
+ (when prompt
+ (display-message 'no-log (format "%s" prompt)))
(let ((event (next-command-event)))
(sit-for 0)
;; We junk all non-key events. Is this naughty?
(event-to-character event))
event)))
+(defun gnus-xmas-article-describe-bindings (&optional prefix)
+ "Show a list of all defined keys, and their definitions.
+The optional argument PREFIX, if non-nil, should be a key sequence;
+then we display only bindings that start with that prefix."
+ (interactive)
+ (gnus-article-check-buffer)
+ (let ((keymap (copy-keymap gnus-article-mode-map))
+ (map (copy-keymap gnus-article-send-map))
+ (sumkeys (where-is-internal 'gnus-article-read-summary-keys))
+ parent agent draft)
+ (define-key keymap "S" map)
+ (set-keymap-default-binding map nil)
+ (with-current-buffer gnus-article-current-summary
+ (set-keymap-parent
+ keymap
+ (if (setq parent (keymap-parent gnus-article-mode-map))
+ (prog1
+ (setq parent (copy-keymap parent))
+ (set-keymap-parent parent (current-local-map)))
+ (current-local-map)))
+ (let ((def (key-binding "S"))
+ gnus-pick-mode)
+ (set-keymap-parent map (if (symbolp def)
+ (symbol-value def)
+ def))
+ (dolist (key sumkeys)
+ (when (setq def (key-binding key))
+ (define-key keymap key def))))
+ (when (boundp 'gnus-agent-summary-mode)
+ (setq agent gnus-agent-summary-mode))
+ (when (boundp 'gnus-draft-mode)
+ (setq draft gnus-draft-mode)))
+ (with-temp-buffer
+ (setq major-mode 'gnus-article-mode)
+ (use-local-map keymap)
+ (set (make-local-variable 'gnus-agent-summary-mode) agent)
+ (set (make-local-variable 'gnus-draft-mode) draft)
+ (describe-bindings prefix))))
+
(defun gnus-xmas-define ()
(setq gnus-mouse-2 [button2])
(setq gnus-mouse-3 [button3])
(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)
-
- (if (and (<= emacs-major-version 19)
- (< emacs-minor-version 14))
- (defalias 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
+ (defalias 'gnus-assq-delete-all 'gnus-xmas-assq-delete-all)
+
+ (unless (fboundp 'member-ignore-case)
+ (defun member-ignore-case (elt list)
+ (while (and list
+ (or (not (stringp (car list)))
+ (not (string= (downcase elt) (downcase (car list))))))
+ (setq list (cdr list)))
+ list))
(unless (boundp 'standard-display-table)
(setq standard-display-table nil))
(defvar gnus-mouse-face-prop 'highlight)
- (defun gnus-byte-code (func)
- "Return a form that can be `eval'ed based on FUNC."
- (let ((fval (indirect-function func)))
- (if (compiled-function-p fval)
- (list 'funcall fval)
- (cons 'progn (cdr (cdr fval))))))
-
(unless (fboundp 'match-string-no-properties)
(defalias 'match-string-no-properties 'match-string))
- (defalias 'gnus-x-color-values
- (if (fboundp 'x-color-values)
- 'x-color-values
- (lambda (color)
- (color-instance-rgb-components
- (make-color-instance color))))))
+ (unless (fboundp 'char-width)
+ (defalias 'char-width (lambda (ch) 1))))
(defun gnus-xmas-redefine ()
"Redefine lots of Gnus functions for XEmacs."
(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-select-lowest-window
+ 'gnus-xmas-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)
+ '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-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)
(defalias 'gnus-remove-image 'gnus-xmas-remove-image)
+ (defalias 'gnus-article-describe-bindings
+ 'gnus-xmas-article-describe-bindings)
;; 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
;; -- 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)
:color-symbols
(("thing" . ,(car gnus-logo-colors))
("shadow" . ,(cadr gnus-logo-colors))
+ ("oort" . "#eeeeee")
("background" . ,(face-background 'default)))])
((featurep 'xbm)
`[xbm :file ,logo-xbm])
(while (not (eobp))
(insert (make-string (/ (max (- (window-width) (or x 35)) 0) 2)
?\ ))
- (forward-line 1))
- (setq gnus-simple-splash nil))
+ (forward-line 1)))
(goto-char (point-min))
(let* ((pheight (+ 20 (count-lines (point-min) (point-max))))
(wheight (window-height))
(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)))
+ (put-text-property (point-min) (point-max) 'face 'gnus-splash)))
(setq modeline-buffer-identification
(list (concat gnus-version ": *Group*")))
(set-buffer-modified-p t))
;;; The 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 valid values are
-`default-toolbar', `top-toolbar', `bottom-toolbar',
-`right-toolbar', and `left-toolbar'."
- :type '(choice (const default-toolbar)
- (const top-toolbar) (const bottom-toolbar)
- (const left-toolbar) (const right-toolbar)
+(defun gnus-xmas-update-toolbars ()
+ "Update the toolbars' appearance."
+ (when (and (not noninteractive)
+ (featurep 'gnus-xmas))
+ (save-excursion
+ (dolist (buffer (buffer-list))
+ (set-buffer buffer)
+ (cond ((eq major-mode 'gnus-group-mode)
+ (gnus-xmas-setup-group-toolbar))
+ ((eq major-mode 'gnus-summary-mode)
+ (gnus-xmas-setup-summary-toolbar)))))))
+
+(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
+toolbar, the rest mean to display the toolbar on the place which those
+names show."
+ :type '(choice (const default)
+ (const top) (const bottom) (const left) (const right)
(const :tag "no toolbar" nil))
+ :set (lambda (symbol value)
+ (set-default
+ symbol
+ (if (or (not value)
+ (memq value (list 'default 'top 'bottom 'right 'left)))
+ value
+ 'default))
+ (gnus-xmas-update-toolbars))
+ :group 'gnus-xmas)
+
+(defcustom gnus-toolbar-thickness
+ (if (featurep 'toolbar)
+ (cons (specifier-instance default-toolbar-height)
+ (specifier-instance default-toolbar-width)))
+ "*Cons of the height and the width specifying the thickness of a toolbar.
+The height is used for the toolbar displayed on the top or the bottom,
+the width is used for the toolbar displayed on the right or the left."
+ :type '(cons :tag "height & width"
+ (integer :tag "height") (integer :tag "width"))
+ :set (lambda (symbol value)
+ (set-default
+ symbol
+ (if (and (consp value) (natnump (car value)) (natnump (cdr value)))
+ value
+ '(37 . 40)))
+ (gnus-xmas-update-toolbars))
:group 'gnus-xmas)
(defvar gnus-group-toolbar
[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.")
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-exit gnus-summary-exit t "Exit this summary"])
"The summary buffer mail toolbar.")
+(defun gnus-xmas-setup-toolbar (toolbar)
+ (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))
+ (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 ()
- (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))))
+ (gnus-xmas-setup-toolbar 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)))
- (and gnus-use-toolbar
- (message-xmas-setup-toolbar bar nil "gnus")
- (set-specifier (symbol-value gnus-use-toolbar)
- (cons (current-buffer) bar)))))
+ (gnus-xmas-setup-toolbar (if (gnus-news-group-p gnus-newsgroup-name)
+ gnus-summary-toolbar
+ gnus-summary-mail-toolbar)))
(defun gnus-xmas-mail-strip-quoted-names (address)
"Protect mail-strip-quoted-names from nil input.
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))
-
-(defface gnus-x-face '((t (:foreground "black" :background "white")))
- "Face to show X face"
- :group 'gnus-xmas)
-
-(defun gnus-xmas-article-display-xface (data)
- "Display the XFace in DATA."
- (save-excursion
- (let ((xface-glyph
- (cond
- ((featurep 'xface)
- (make-glyph (vector 'xface :data
- (concat "X-Face: " data))))
- ((featurep 'xpm)
- (let ((cur (current-buffer)))
- (save-excursion
- (gnus-set-work-buffer)
- (insert data)
- (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])))))
- ;;(set-glyph-face xface-glyph 'gnus-x-face)
-
- (gnus-article-goto-header "from")
- (gnus-put-image xface-glyph " ")
- (gnus-add-wash-type 'xface)
- (gnus-add-image 'xface xface-glyph))))
-
(defvar gnus-xmas-modeline-left-extent
(let ((ext (copy-extent modeline-buffer-id-left-extent)))
ext))
(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)
+(defun gnus-xmas-mime-button-menu (event prefix)
"Construct a context-sensitive menu of MIME commands."
- (interactive "e")
+ (interactive "e\nP")
(let ((response (get-popup-menu-response
`("MIME Part"
,@(mapcar (lambda (c) `[,(caddr c) ,(car c) t])
(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 (progn (end-of-line) (point)))
- ;; 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-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-xmas-mailing-list-menu-add ()
(gnus-xmas-menu-add mailing-list
gnus-mailing-list-menu))
(defun gnus-xmas-image-type-available-p (type)
- (featurep type))
-
-(defun gnus-xmas-create-image (file)
- (with-temp-buffer
- (insert-file-contents file)
- (mm-create-image-xemacs (car (last (split-string file "[.]"))))))
-
-(defun gnus-xmas-put-image (glyph &optional string)
+ (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)
+ (let ((type (cond
+ (type
+ (symbol-name type))
+ ((and (not data-p)
+ (string-match "[.]" file))
+ (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
+ (if type
+ (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)
- (insert string)
+ (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 t)
+ (set-extent-property extent 'gnus-image category)
(set-extent-property extent 'duplicable t)
- (set-extent-property extent 'begin-glyph glyph)))
+ (if string
+ (set-extent-property extent 'invisible t))
+ (set-extent-property extent 'end-glyph glyph))
+ glyph)
-(defun gnus-xmas-remove-image (image)
+(defun gnus-xmas-remove-image (image &optional category)
+ "Remove the image matching IMAGE and CATEGORY found first."
(map-extents
(lambda (ext unused)
- (when (equal (extent-begin-glyph ext) image)
- (set-extent-property ext 'begin-glyph nil))
- nil)
- nil nil nil nil nil 'gnus-image))
+ (when (equal (extent-end-glyph ext) image)
+ (set-extent-property ext 'invisible nil)
+ (set-extent-property ext 'end-glyph nil)
+ t))
+ nil nil nil nil nil 'gnus-image category))
+
+(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)