X-Git-Url: https://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-xmas.el;h=1e5fafb987603ce2fc6329298b44b0476df3028d;hb=0f63151c0cfcb3498678c203edb84e6a1d2b57e0;hp=233912e585fd1f1687fd7276532e085f78f5f309;hpb=c671432d20b097fd8e8f6fee9f64446771699b13;p=gnus diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index 233912e58..1e5fafb98 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -1,7 +1,7 @@ ;;; gnus-xmas.el --- Gnus functions for XEmacs ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2005, 2006 Free Software Foundation, Inc. +;; 2005, 2006, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -10,7 +10,7 @@ ;; 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, @@ -39,7 +39,7 @@ (defvar menu-bar-mode (featurep 'menubar)) (require 'messagexmas) (require 'wid-edit) -(require 'timer-funcs) +(require 'gnus-util) (defgroup gnus-xmas nil "XEmacsoid support for Gnus" @@ -103,6 +103,9 @@ Possibly the `etc' directory has not been installed."))) (defvar gnus-mouse-2) (defvar standard-display-table) (defvar gnus-tree-minimize-window) +;;`gnus-agent-mode' in gnus-agent.el will define it. +(defvar gnus-agent-summary-mode) +(defvar gnus-draft-mode) (defun gnus-xmas-highlight-selected-summary () ;; Highlight selected article in summary buffer @@ -171,18 +174,18 @@ displayed, no centering will be performed." (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))) @@ -221,6 +224,10 @@ call it with the value of the `gnus-data' text property." (delete-extent extent) nil))) +(defun gnus-xmas-overlays-in (beg end) + "Return a list of the extents that overlap the region BEG ... END." + (mapcar-extents #'identity nil nil beg end)) + (defun gnus-xmas-window-top-edge (&optional window) (nth 1 (window-pixel-edges window))) @@ -334,7 +341,7 @@ call it with the value of the `gnus-data' text property." (defun gnus-xmas-read-event-char (&optional prompt) "Get the next event." (when prompt - (message "%s" 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? @@ -346,6 +353,45 @@ call it with the value of the `gnus-data' text property." (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]) @@ -368,13 +414,20 @@ call it with the value of the `gnus-data' text property." (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-get 'extent-property) (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-overlays-in 'gnus-xmas-overlays-in) (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) @@ -436,6 +489,8 @@ call it with the value of the `gnus-data' text property." (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 @@ -841,7 +896,7 @@ XEmacs compatibility workaround." 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 @@ -861,8 +916,6 @@ XEmacs compatibility workaround." (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)) @@ -874,13 +927,18 @@ XEmacs compatibility workaround." 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) - (let ((type (if type - (symbol-name type) - (car (last (split-string file "[.]"))))) + (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") @@ -902,8 +960,9 @@ XEmacs compatibility workaround." (insert-file-contents-literally file)) (make-glyph (vector - (or (intern type) - (mm-image-type-from-buffer)) + (if type + (intern type) + (mm-image-type-from-buffer)) :data (buffer-string)))))) (when face (set-glyph-face glyph face)) @@ -945,5 +1004,4 @@ Warning: Don't insert text immediately after the image." (provide 'gnus-xmas) -;;; arch-tag: 4e84de3f-ea0a-4ee3-bfeb-e03d46fcacef ;;; gnus-xmas.el ends here