Commit b6fda8fc authored by Julien Danjou's avatar Julien Danjou Committed by Katsumi Yamaoka
Browse files

Merge changes made in Gnus trunk.

gnus-gravatar.el (gnus-gravatar-insert): Fix search backward.
gnus-gravatar.el (gnus-gravatar-insert): Fix search in case mail-address contains the same string as real-name.
gnus-gravatar.el (gnus-gravatar-insert): More robust search.
gnus-ems.el (gnus-put-image): Revert Lars, change and insert non-blank in header, otherwise it'll get stripped.
parent 635be05a
2010-09-28 Julien Danjou <julien@danjou.info>
* gnus-gravatar.el (gnus-gravatar-insert): Fix search in case
mail-address contains the same string as real-name.
* gnus-ems.el (gnus-put-image): Revert Lars, change and insert
non-blank in header, otherwise it'll get stripped.
* gnus-gravatar.el (gnus-gravatar-insert): Search backward for
real-name, and then for mail address rather than doing : or , search.
2010-09-28 Katsumi Yamaoka <yamaoka@jpl.org>
 
* nnimap.el (auth-source-forget-user-or-password)
......
......@@ -277,7 +277,7 @@
(defun gnus-put-image (glyph &optional string category)
(let ((point (point)))
(insert-image glyph (or string " "))
(insert-image glyph (or string "*"))
(put-text-property point (point) 'gnus-image-category category)
(unless string
(put-text-property (1- (point)) (point)
......
......@@ -59,7 +59,7 @@ unpressed button."
(gravatar-retrieve
(car address)
'gnus-gravatar-insert
(list header (car address) category)))))))
(list header address category)))))))
(defun gnus-gravatar-insert (gravatar header address category)
"Insert GRAVATAR for ADDRESS in HEADER in current article buffer.
......@@ -68,24 +68,31 @@ Set image category to CATEGORY."
(gnus-with-article-headers
(gnus-article-goto-header header)
(mail-header-narrow-to-field)
(when (and (search-forward address nil t)
(or (search-backward ", " nil t)
(search-backward ": " nil t)))
(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 ((inhibit-read-only t)
(point (point))
(gravatar (append
gravatar
`(:ascent center :relief ,gnus-gravatar-relief))))
(gnus-put-image gravatar nil category)
(put-text-property point (point) 'gnus-gravatar address)
(gnus-add-wash-type category)
(gnus-add-image category gravatar)))))))
(let ((real-name (cdr address))
(mail-address (car address)))
(when (if real-name ; have a realname, go for it!
(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 "\"")
(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 ((inhibit-read-only t)
(point (point))
(gravatar (append
gravatar
`(:ascent center :relief ,gnus-gravatar-relief))))
(gnus-put-image gravatar nil category)
(put-text-property point (point) 'gnus-gravatar address)
(gnus-add-wash-type category)
(gnus-add-image category gravatar))))))))
;;;###autoload
(defun gnus-treat-from-gravatar ()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment