Synch to Gnus 200306241704.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fdb0a61..a3a1d86 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
+2003-06-24  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * spam.el (spam-parse-list): use gnus-extract-address-components
+       instead of ietf-drums-parse-addresses
+       (spam-from-listed-p): let* was unnecessary
+
 2003-06-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * gnus-ems.el (gnus-put-image): Mark the right text segment with
+       gnus-image-category. 
+
        * gnus-srvr.el (gnus-browse-unsubscribe-group): Strip prefix from
        native groups.
 

diff --git a/lisp/gnus-ems.el b/lisp/gnus-ems.el
index 26906a0..d2dde41 100644 (file)
--- a/lisp/gnus-ems.el
+++ b/lisp/gnus-ems.el
@@ -234,12 +234,13 @@
     (apply 'create-image file type data-p props)))
 
 (defun gnus-put-image (glyph &optional string category)
-  (insert-image glyph (or string " "))
-  (put-text-property (1- (point)) (point) 'gnus-image-category category)
-  (unless string
-    (put-text-property (1- (point)) (point)
-                      'gnus-image-text-deletable t))
-  glyph)
+  (let ((point (point)))
+    (insert-image glyph (or string " "))
+    (put-text-property point (point) 'gnus-image-category category)
+    (unless string
+      (put-text-property (1- (point)) (point)
+                        'gnus-image-text-deletable t))
+    glyph))
 
 (defun gnus-remove-image (image &optional category)
   (dolist (position (message-text-with-property 'display))

diff --git a/lisp/spam.el b/lisp/spam.el
index 8f329dc..abad927 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -47,10 +47,6 @@
 ;; for nnimap-split-download-body-default
 (eval-when-compile (require 'nnimap))
 
-;; autoload ietf-drums-parse-addresses
-(eval-and-compile
-  (autoload 'ietf-drums-parse-addresses "ietf-drums"))
-
 ;; autoload query-dig
 (eval-and-compile
   (autoload 'query-dig "dig"))
@@ -1000,7 +996,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
          (setq address (buffer-substring (point) (spam-point-at-eol)))
          (forward-line 1)
          ;; insert the e-mail address if detected, otherwise the raw data
-         (let ((pure-address (car (ietf-drums-parse-addresses address))))
+         (let ((pure-address (cadr (gnus-extract-address-components address))))
            (push (or pure-address address) contents))))
       (nreverse contents))))
 
@@ -1008,7 +1004,7 @@ Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
   (let ((from (message-fetch-field "from"))
        found)
     (while cache
-      (let* ((address (pop cache)))
+      (let ((address (pop cache)))
        (unless (zerop (length address)) ; 0 for a nil address too
          (setq address (regexp-quote address))
          ;; fix regexp-quote's treatment of user-intended regexes