* shr.el (shr-insert): Fix up the white space only regexp.

[gnus] / lisp / gnus-gravatar.el

diff --git a/lisp/gnus-gravatar.el b/lisp/gnus-gravatar.el
index 187b816..9c13027 100644 (file)
--- a/lisp/gnus-gravatar.el
+++ b/lisp/gnus-gravatar.el
@@ -33,14 +33,20 @@
 (defcustom gnus-gravatar-size 32
   "How big should gravatars be displayed."
   :type 'integer
+  :version "24.1"
   :group 'gnus-gravatar)
 
-(defcustom gnus-gravatar-relief 1
-  "If non-nil, adds a shadow rectangle around the image. The
-value, relief, specifies the width of the shadow lines, in
-pixels. If relief is negative, shadows are drawn so that the
-image appears as a pressed button; otherwise, it appears as an
-unpressed button."
+(defcustom gnus-gravatar-properties '(:ascent center :relief 1)
+  "List of image properties applied to Gravatar images."
+  :type 'list
+  :version "24.1"
+  :group 'gnus-gravatar)
+
+(defcustom gnus-gravatar-too-ugly (if (boundp 'gnus-article-x-face-too-ugly)
+                                     gnus-article-x-face-too-ugly)
+  "Regexp matching posters whose avatar shouldn't be shown automatically."
+  :type '(choice regexp (const nil))
+  :version "24.1"
   :group 'gnus-gravatar)
 
 (defun gnus-gravatar-transform-address (header category)
@@ -56,10 +62,17 @@ unpressed button."
              (mail-fetch-field header)))))
       (let ((gravatar-size gnus-gravatar-size))
         (dolist (address addresses)
-          (gravatar-retrieve
-           (car address)
-           'gnus-gravatar-insert
-           (list header address category)))))))
+         (unless (and gnus-gravatar-too-ugly
+                      (or (string-match gnus-gravatar-too-ugly
+                                        (car address))
+                          (and (cdr address)
+                               (string-match gnus-gravatar-too-ugly
+                                             (cdr address)))))
+           (ignore-errors
+              (gravatar-retrieve
+               (car address)
+               'gnus-gravatar-insert
+               (list header address category)))))))))
 
 (defun gnus-gravatar-insert (gravatar header address category)
   "Insert GRAVATAR for ADDRESS in HEADER in current article buffer.
@@ -68,15 +81,16 @@ Set image category to CATEGORY."
     (gnus-with-article-headers
       (gnus-article-goto-header header)
       (mail-header-narrow-to-field)
-      (goto-char (point-max))
       (let ((real-name (cdr address))
             (mail-address (car address)))
         (when (if real-name             ; have a realname, go for it!
-                  (search-backward real-name)
-                (search-backward address))
+                  (and (search-forward real-name nil t)
+                       (search-backward real-name nil t))
+                (and (search-forward mail-address nil t)
+                     (search-backward mail-address nil t)))
           (goto-char (1- (point)))
           ;; If we're on the " quoting the name, go backward
-          (when (looking-at "\"")
+          (when (looking-at "[\"<]")
             (goto-char (1- (point))))
           ;; Do not do anything if there's already a gravatar. This can
           ;; happens if the buffer has been regenerated in the mean time, for
@@ -84,10 +98,9 @@ Set image category to CATEGORY."
           ;; another mail with the same someaddress.
           (unless (memq 'gnus-gravatar (text-properties-at (point)))
             (let ((inhibit-read-only t)
-                  (point (point))
-                  (gravatar (append
-                             gravatar
-                             `(:ascent center :relief ,gnus-gravatar-relief))))
+                  (point (point)))
+             (unless (featurep 'xemacs)
+               (setq gravatar (append gravatar gnus-gravatar-properties)))
               (gnus-put-image gravatar nil category)
               (put-text-property point (point) 'gnus-gravatar address)
               (gnus-add-wash-type category)
@@ -101,7 +114,10 @@ If gravatar is already displayed, remove it."
   (gnus-with-article-buffer
     (if (memq 'from-gravatar gnus-article-wash-types)
         (gnus-delete-images 'from-gravatar)
-      (gnus-gravatar-transform-address "from" 'from-gravatar))))
+      (let ((gnus-gravatar-too-ugly
+            (unless buffer-read-only ;; When type `W D g'
+              gnus-gravatar-too-ugly)))
+       (gnus-gravatar-transform-address "from" 'from-gravatar)))))
 
 ;;;###autoload
 (defun gnus-treat-mail-gravatar ()
@@ -111,8 +127,11 @@ If gravatars are already displayed, remove them."
     (gnus-with-article-buffer
       (if (memq 'mail-gravatar gnus-article-wash-types)
           (gnus-delete-images 'mail-gravatar)
-        (gnus-gravatar-transform-address "cc" 'mail-gravatar)
-        (gnus-gravatar-transform-address "to" 'mail-gravatar))))
+       (let ((gnus-gravatar-too-ugly
+              (unless buffer-read-only ;; When type `W D h'
+                gnus-gravatar-too-ugly)))
+         (gnus-gravatar-transform-address "cc" 'mail-gravatar)
+         (gnus-gravatar-transform-address "to" 'mail-gravatar)))))
 
 (provide 'gnus-gravatar)