X-Git-Url: http://cgit.sxemacs.org/?a=blobdiff_plain;f=lisp%2Fgnus-xmas.el;h=839b857f33b73f318f6dd09a90d48ef15d4863a2;hb=1e2f84e325c24a2d1c4f08074bca23d235ff9287;hp=2389ea47688f975a7c0f6964f041cbc8c154352e;hpb=95f313b85342e2c1beda86554b085fa3285571d1;p=gnus diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index 2389ea476..839b857f3 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -1,7 +1,6 @@ ;;; gnus-xmas.el --- Gnus functions for XEmacs -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -;; 2005, 2006, 2008 Free Software Foundation, Inc. +;; Copyright (C) 1995-2014 Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; Keywords: news @@ -19,9 +18,7 @@ ;; 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 . ;;; Commentary: @@ -107,16 +104,6 @@ Possibly the `etc' directory has not been installed."))) (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'." @@ -224,6 +211,14 @@ call it with the value of the `gnus-data' text property." (delete-extent extent) nil))) +(defun gnus-xmas-overlays-at (pos) + "Return a list of the extents that contain the character at POS." + (mapcar-extents #'identity nil nil pos (1+ pos))) + +(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))) @@ -337,7 +332,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? @@ -358,10 +353,17 @@ then we display only bindings that start with that prefix." (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) @@ -395,26 +397,22 @@ then we display only bindings that start with that prefix." (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. FRONT-ADVANCE and REAR-ADVANCE are ignored." (make-extent beg end buffer))) + (defalias 'gnus-copy-overlay 'copy-extent) (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-at 'gnus-xmas-overlays-at) + (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) @@ -423,28 +421,22 @@ FRONT-ADVANCE and REAR-ADVANCE are ignored." (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)))) @@ -521,8 +513,7 @@ FRONT-ADVANCE and REAR-ADVANCE are ignored." (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)) @@ -756,11 +747,6 @@ XEmacs compatibility workaround." 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)) @@ -807,10 +793,6 @@ XEmacs compatibility workaround." (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) @@ -843,74 +825,6 @@ XEmacs compatibility workaround." (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)) @@ -922,9 +836,12 @@ XEmacs compatibility workaround." (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") @@ -946,8 +863,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)) @@ -989,5 +907,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