;;; gnus-xmas.el --- Gnus functions for XEmacs
-;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;; 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2013 Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; Keywords: news
;; 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., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
(defvar menu-bar-mode (featurep 'menubar))
(require 'messagexmas)
(require 'wid-edit)
+(require 'gnus-util)
(defgroup gnus-xmas nil
"XEmacsoid support for Gnus"
(defvar gnus-agent-summary-mode)
(defvar gnus-draft-mode)
-(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 (point-at-bol) (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'."
(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)))
(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)))
(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?
(let ((keymap (copy-keymap gnus-article-mode-map))
(map (copy-keymap gnus-article-send-map))
(sumkeys (where-is-internal 'gnus-article-read-summary-keys))
- agent draft)
+ 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)
(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
(lambda (beg end &optional buffer front-advance rear-advance)
"Create a new overlay with range BEG to END in BUFFER.
(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)
(defalias 'gnus-window-edges 'window-pixel-edges)
(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))))
(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))
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))
(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)
(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 (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
- (mapc '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))
(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")
(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))
(provide 'gnus-xmas)
-;;; arch-tag: 4e84de3f-ea0a-4ee3-bfeb-e03d46fcacef
;;; gnus-xmas.el ends here