From: Lars Magne Ingebrigtsen Date: Sat, 29 Dec 2001 10:11:49 +0000 (+0000) Subject: * gnus-picon.el (gnus-picons-news-directories): Removed obsolete X-Git-Url: http://cgit.sxemacs.org/?a=commitdiff_plain;h=0f827c2e37eaf3c8fd68e61f7c71b15b448ccbc7;hp=358ba5811d0c584129c4bc03f23a6391d35c2a0f;p=gnus * gnus-picon.el (gnus-picons-news-directories): Removed obsolete alias. (gnus-picons-database): Default to list. (gnus-picons-lookup-internal): Use it. * nnmail.el (nnmail-article-group): Default nnmail-split-methods to "bogus". --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8970f0e2f..79307e633 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,13 @@ 2001-12-29 Lars Magne Ingebrigtsen + * gnus-picon.el (gnus-picons-news-directories): Removed obsolete + alias. + (gnus-picons-database): Default to list. + (gnus-picons-lookup-internal): Use it. + + * nnmail.el (nnmail-article-group): Default nnmail-split-methods + to "bogus". + * gnus-win.el (gnus-configure-windows-hook): New hook. 2001-12-29 Sascha L,A|(Bdecke diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index b6824711b..91c73cef9 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -139,7 +139,8 @@ "^X-BeenThere:" "^X-Mailman-Version:" "^List-Help:" "^List-Post:" "^List-Subscribe:" "^List-Id:" "^List-Unsubscribe:" "^List-Archive:" "^X-Content-length:" "^X-Posting-Agent:" "^Original-Received:" - "^X-Request-PGP:" "^X-Fingerprint:" "^X-WRIEnvto:" "^X-WRIEnvfrom:"g) + "^X-Request-PGP:" "^X-Fingerprint:" "^X-WRIEnvto:" "^X-WRIEnvfrom:" + "^X-Virus-Scanned:" "^X-Delivery-Agent:") "*All headers that start with this regexp will be hidden. This variable can also be a list of regexps of headers to be ignored. If `gnus-visible-headers' is non-nil, this variable will be ignored." @@ -1049,7 +1050,12 @@ See the manual for details." :type gnus-article-treat-custom) (put 'gnus-treat-display-smileys 'highlight t) -(defcustom gnus-treat-display-picons (if (featurep 'xemacs) 'head nil) +(defcustom gnus-treat-display-picons + (if (or (and (featurep 'xemacs) + (featurep 'xpm)) + (and (fboundp 'image-type-available-p) + (image-type-available-p 'pbm))) + 'head nil) "Display picons. Valid values are nil, t, `head', `last', an integer or a predicate. See the manual for details." diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index db78d9050..4c5a01504 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -29,7 +29,7 @@ (require 'gnus) ;; (require 'xpm) -(require 'annotations) +;; (require 'annotations) (require 'custom) (require 'gnus-art) (require 'gnus-win) @@ -54,7 +54,7 @@ This is only useful if `gnus-picons-display-where' is `picons'." :type 'boolean :group 'picons) -(defcustom gnus-picons-database "/usr/local/faces" +(defcustom gnus-picons-database '("/usr/local/faces" "/usr/lib/picon") "*Defines the location of the faces database. For information on obtaining this database of pretty pictures, please see http://www.cs.indiana.edu/picons/ftp/index.html" @@ -65,8 +65,6 @@ see http://www.cs.indiana.edu/picons/ftp/index.html" "*List of directories to search for newsgroups faces." :type '(repeat string) :group 'picons) -(define-obsolete-variable-alias 'gnus-picons-news-directory - 'gnus-picons-news-directories) (defcustom gnus-picons-user-directories '("local" "users" "usenix" "misc") "*List of directories to search for user faces." @@ -173,8 +171,8 @@ arguments necessary for the job.") (defun gnus-picons-remove-all () "Removes all picons from the Gnus display(s)." (interactive) - (map-extents (function (lambda (ext unused) (delete-annotation ext) nil)) - nil nil nil nil nil 'gnus-picon) + ;;(map-extents (function (lambda (ext unused) (delete-annotation ext) nil)) +;; nil nil nil nil nil 'gnus-picon) (setq gnus-picons-jobs-alist '()) ;; notify running job that it may have been preempted (if (and (listp gnus-picons-job-already-running) @@ -249,12 +247,15 @@ arguments necessary for the job.") (set-extent-property annot 'duplicable t) annot)) +(defun gnus-picons-make-annotation (&rest args) + nil) + + (defun gnus-article-display-picons () "Display faces for an author and her domain in gnus-picons-display-where." (interactive) (let (from at-idx) - (when (and (featurep 'xpm) - (or (not (fboundp 'device-type)) (equal (device-type) 'x)) + (when (and (or (not (fboundp 'device-type)) (equal (device-type) 'x)) (setq from (mail-fetch-field "from")) (setq from (downcase (or (cadr (mail-extract-address-components from)) @@ -344,10 +345,19 @@ arguments necessary for the job.") (add-hook 'gnus-summary-exit-hook 'gnus-picons-remove-all)))))) -(defun gnus-picons-lookup-internal (addrs dir) - (setq dir (expand-file-name dir gnus-picons-database)) - (gnus-picons-try-face (dolist (part (reverse addrs) dir) - (setq dir (expand-file-name part dir))))) +(defun gnus-picons-lookup-internal (addrs directory) + (let ((dbs gnus-picons-database) + result db dir) + (unless (listp dbs) + (setq dbs (list dbs))) + (while (and (not result) + (setq db (pop dbs))) + (setq dir (expand-file-name directory gnus-picons-database)) + (setq result + (gnus-picons-try-face + (dolist (part (reverse addrs) dir) + (setq dir (expand-file-name part dir)))))) + result)) (defun gnus-picons-lookup (addrs dirs) "Lookup the picon for ADDRS in databases DIRS. diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 8ced7d914..d9cee77aa 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -77,8 +77,7 @@ "Various mail options." :group 'nnmail) -(defcustom nnmail-split-methods - '(("mail.misc" "")) +(defcustom nnmail-split-methods '(("mail.misc" "")) "*Incoming mail will be split according to this variable. If you'd like, for instance, one mail group for mail from the @@ -975,7 +974,7 @@ FUNC will be called with the buffer narrowed to each mail." (defun nnmail-article-group (func &optional trace) "Look at the headers and return an alist of groups that match. FUNC will be called with the group name to determine the article number." - (let ((methods nnmail-split-methods) + (let ((methods (or nnmail-split-methods '(("bogus" "")))) (obuf (current-buffer)) (beg (point-min)) end group-art method grp)