X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fgnus-gravatar.el;h=c331b018de80624865a85d5d19a13d45c6558bc3;hp=e46460e7260391ee509102ff0c5febc4c9052fb2;hb=b83561e18ceb438203812786590893bd5fc2a6cc;hpb=82e935523d5449e9fb53c95fa9a6f21f6d83513e

diff --git a/lisp/gnus-gravatar.el b/lisp/gnus-gravatar.el
index e46460e72..c331b018d 100644
--- a/lisp/gnus-gravatar.el
+++ b/lisp/gnus-gravatar.el
@@ -1,6 +1,6 @@
 ;;; gnus-gravatar.el --- Gnus Gravatar support
 
-;; Copyright (C) 2010 Free Software Foundation, Inc.
+;; Copyright (C) 2010-2015 Free Software Foundation, Inc.
 
 ;; Author: Julien Danjou <julien@danjou.info>
 ;; Keywords: news
@@ -35,13 +35,13 @@
 (defcustom gnus-gravatar-size nil
   "How big should gravatars be displayed.
 If nil, default to `gravatar-size'."
-  :type 'integer
+  :type '(choice (const nil) integer)
   :version "24.1"
   :group 'gnus-gravatar)
 
 (defcustom gnus-gravatar-properties '(:ascent center :relief 1)
   "List of image properties applied to Gravatar images."
-  :type 'list
+  :type 'sexp
   :version "24.1"
   :group 'gnus-gravatar)
 
@@ -80,37 +80,43 @@ If nil, default to `gravatar-size'."
   "Insert GRAVATAR for ADDRESS in HEADER in current article buffer.
 Set image category to CATEGORY."
   (unless (eq gravatar 'error)
-    (gnus-with-article-headers
-      ;; The buffer can be gone at this time
-      (when (buffer-live-p (current-buffer))
-        (gnus-article-goto-header header)
-        (mail-header-narrow-to-field)
-        (let ((real-name (car address))
-              (mail-address (cadr address)))
-          (when (if real-name
-		    (re-search-forward
-		     (concat (gnus-replace-in-string
-			      (regexp-quote real-name) "[\t ]+" "[\t\n ]+")
-			     "\\|"
-			     (regexp-quote mail-address))
-		     nil t)
-		  (search-forward mail-address nil t))
-	    (goto-char (1- (match-beginning 0)))
-            ;; If we're on the " quoting the name, go backward
-            (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
-            ;; example we were fetching someaddress, and then we change to
-            ;; another mail with the same someaddress.
-            (unless (memq 'gnus-gravatar (text-properties-at (point)))
-              (let ((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)
-                (gnus-add-image category gravatar)))))))))
+    (gnus-with-article-buffer
+      (let ((mark (point-marker))
+	    (inhibit-point-motion-hooks t)
+	    (case-fold-search t))
+	(save-restriction
+	  (article-narrow-to-head)
+	  ;; The buffer can be gone at this time
+	  (when (buffer-live-p (current-buffer))
+	    (gnus-article-goto-header header)
+	    (mail-header-narrow-to-field)
+	    (let ((real-name (car address))
+		  (mail-address (cadr address)))
+	      (when (if real-name
+			(re-search-forward
+			 (concat (gnus-replace-in-string
+				  (regexp-quote real-name) "[\t ]+" "[\t\n ]+")
+				 "\\|"
+				 (regexp-quote mail-address))
+			 nil t)
+		      (search-forward mail-address nil t))
+		(goto-char (1- (match-beginning 0)))
+		;; If we're on the " quoting the name, go backward
+		(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
+		;; example we were fetching someaddress, and then we change to
+		;; another mail with the same someaddress.
+		(unless (memq 'gnus-gravatar (text-properties-at (point)))
+		  (let ((point (point)))
+		    (unless (featurep 'xemacs)
+		      (setq gravatar (append gravatar gnus-gravatar-properties)))
+		    (gnus-put-image gravatar (buffer-substring (point) (1+ point)) category)
+		    (put-text-property point (point) 'gnus-gravatar address)
+		    (gnus-add-wash-type category)
+		    (gnus-add-image category gravatar)))))))
+	(goto-char (marker-position mark))))))
 
 ;;;###autoload
 (defun gnus-treat-from-gravatar (&optional force)