[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r101662: Merge changes made in Gnus t
From: |
Katsumi Yamaoka |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r101662: Merge changes made in Gnus trunk. |
Date: |
Tue, 28 Sep 2010 11:47:12 +0000 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 101662
author: Julien Danjou <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2010-09-28 11:47:12 +0000
message:
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.
modified:
lisp/gnus/ChangeLog
lisp/gnus/gnus-ems.el
lisp/gnus/gnus-gravatar.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-09-28 05:12:21 +0000
+++ b/lisp/gnus/ChangeLog 2010-09-28 11:47:12 +0000
@@ -1,3 +1,14 @@
+2010-09-28 Julien Danjou <address@hidden>
+
+ * 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 <address@hidden>
* nnimap.el (auth-source-forget-user-or-password)
=== modified file 'lisp/gnus/gnus-ems.el'
--- a/lisp/gnus/gnus-ems.el 2010-09-26 23:01:31 +0000
+++ b/lisp/gnus/gnus-ems.el 2010-09-28 11:47:12 +0000
@@ -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)
=== modified file 'lisp/gnus/gnus-gravatar.el'
--- a/lisp/gnus/gnus-gravatar.el 2010-09-25 12:49:02 +0000
+++ b/lisp/gnus/gnus-gravatar.el 2010-09-28 11:47:12 +0000
@@ -59,7 +59,7 @@
(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 @@
(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 ()
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r101662: Merge changes made in Gnus trunk.,
Katsumi Yamaoka <=