annotate lisp/gnus/gnus-gravatar.el @ 112451:98ad7c9e56a3

gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer. shr.el (shr-image-fetched): Ditto. shr.el (shr-image-fetched): Avoid having point move in the article buffer. gnus-html.el (gnus-html-image-fetched): Kill the buffer anyway, and fix the bug in url-http.el instead. shr.el (shr-image-fetched): Ditto. gravatar.el (gravatar-retrieve): Be silent when retrieving. gnus-gravatar.el (gnus-gravatar-insert): Don't move point around in the article buffer. (gnus-gravatar-insert): Use blank space from the current buffer to avoid breaking text properties. This makes X-Sent updating work again. gnus-art.el (gnus-article-read-summary-keys): Don't call disabled commands.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Mon, 24 Jan 2011 04:10:19 +0000
parents b1eac6d41a93
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
1 ;;; gnus-gravatar.el --- Gnus Gravatar support
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
2
112235
b1eac6d41a93 [Gnus] Update copyright years.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112014
diff changeset
3 ;; Copyright (C) 2010, 2011 Free Software Foundation, Inc.
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
4
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
5 ;; Author: Julien Danjou <julien@danjou.info>
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
6 ;; Keywords: news
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
7
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
9
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
10 ;; GNU Emacs is free software: you can redistribute it and/or modify
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
11 ;; it under the terms of the GNU General Public License as published by
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
12 ;; the Free Software Foundation, either version 3 of the License, or
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
13 ;; (at your option) any later version.
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
14
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
15 ;; GNU Emacs is distributed in the hope that it will be useful,
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
18 ;; GNU General Public License for more details.
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
19
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
20 ;; You should have received a copy of the GNU General Public License
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
22
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
23 ;;; Commentary:
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
24
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
25 ;;; Code:
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
26
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
27 (require 'gravatar)
110957
627742e646c4 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
28 (require 'gnus-art)
111789
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
29 (require 'mail-extr) ;; Because of binding `mail-extr-disable-voodoo'.
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
30
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
31 (defgroup gnus-gravatar nil
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
32 "Gnus Gravatar."
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
33 :group 'gnus-visual)
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
34
111789
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
35 (defcustom gnus-gravatar-size nil
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
36 "How big should gravatars be displayed.
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
37 If nil, default to `gravatar-size'."
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
38 :type 'integer
110661
2b8ece636433 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110634
diff changeset
39 :version "24.1"
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
40 :group 'gnus-gravatar)
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
41
110661
2b8ece636433 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110634
diff changeset
42 (defcustom gnus-gravatar-properties '(:ascent center :relief 1)
2b8ece636433 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110634
diff changeset
43 "List of image properties applied to Gravatar images."
2b8ece636433 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110634
diff changeset
44 :type 'list
2b8ece636433 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110634
diff changeset
45 :version "24.1"
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
46 :group 'gnus-gravatar)
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
47
110957
627742e646c4 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110873
diff changeset
48 (defcustom gnus-gravatar-too-ugly gnus-article-x-face-too-ugly
110805
6bcb1cd1309b [Gnus] Introduce gnus-gravatar-too-ugly.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110800
diff changeset
49 "Regexp matching posters whose avatar shouldn't be shown automatically."
6bcb1cd1309b [Gnus] Introduce gnus-gravatar-too-ugly.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110800
diff changeset
50 :type '(choice regexp (const nil))
6bcb1cd1309b [Gnus] Introduce gnus-gravatar-too-ugly.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110800
diff changeset
51 :version "24.1"
6bcb1cd1309b [Gnus] Introduce gnus-gravatar-too-ugly.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110800
diff changeset
52 :group 'gnus-gravatar)
6bcb1cd1309b [Gnus] Introduce gnus-gravatar-too-ugly.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110800
diff changeset
53
110958
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
54 (defun gnus-gravatar-transform-address (header category &optional force)
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
55 (gnus-with-article-headers
111789
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
56 (let* ((mail-extr-disable-voodoo t)
112014
df9847719afa gnus-gravatar.el (gnus-gravatar-transform-address): Set `mail-extr-ignore-realname-equals-mailbox-name' to nil when extracting the addresses, otherwise we might misplaced the gravatar.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111994
diff changeset
57 (mail-extr-ignore-realname-equals-mailbox-name nil)
111789
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
58 (addresses (mail-extract-address-components
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
59 (or (mail-fetch-field header) "") t))
111994
c92e0a5c96e9 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111872
diff changeset
60 (gravatar-size (or gnus-gravatar-size gravatar-size))
111789
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
61 name)
110958
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
62 (dolist (address addresses)
111789
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
63 (when (and (setq name (car address))
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
64 (string-match "\\` +" name))
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
65 (setcar address (setq name (substring name (match-end 0)))))
110958
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
66 (when (or force
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
67 (not (and gnus-gravatar-too-ugly
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
68 (or (string-match gnus-gravatar-too-ugly
111872
a264bb877bc7 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111789
diff changeset
69 (or (cadr address) ""))
111639
d94e03b64838 gnus-gravatar.el (gnus-gravatar-transform-address): Decode name again.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111432
diff changeset
70 (and name
110958
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
71 (string-match gnus-gravatar-too-ugly
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
72 name))))))
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
73 (ignore-errors
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
74 (gravatar-retrieve
111789
f97704487fb3 Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 111639
diff changeset
75 (cadr address)
110958
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
76 'gnus-gravatar-insert
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
77 (list header address category))))))))
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
78
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
79 (defun gnus-gravatar-insert (gravatar header address category)
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
80 "Insert GRAVATAR for ADDRESS in HEADER in current article buffer.
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
81 Set image category to CATEGORY."
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
82 (unless (eq gravatar 'error)
112451
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
83 (with-current-buffer gnus-article-buffer
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
84 (let ((mark (point-marker))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
85 (inhibit-read-only t)
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
86 (inhibit-point-motion-hooks t)
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
87 (case-fold-search t))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
88 (save-restriction
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
89 (article-narrow-to-head)
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
90 ;; The buffer can be gone at this time
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
91 (when (buffer-live-p (current-buffer))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
92 (gnus-article-goto-header header)
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
93 (mail-header-narrow-to-field)
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
94 (let ((real-name (car address))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
95 (mail-address (cadr address)))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
96 (when (if real-name
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
97 (re-search-forward
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
98 (concat (gnus-replace-in-string
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
99 (regexp-quote real-name) "[\t ]+" "[\t\n ]+")
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
100 "\\|"
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
101 (regexp-quote mail-address))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
102 nil t)
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
103 (search-forward mail-address nil t))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
104 (goto-char (1- (match-beginning 0)))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
105 ;; If we're on the " quoting the name, go backward
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
106 (when (looking-at "[\"<]")
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
107 (goto-char (1- (point))))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
108 ;; Do not do anything if there's already a gravatar. This can
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
109 ;; happens if the buffer has been regenerated in the mean time, for
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
110 ;; example we were fetching someaddress, and then we change to
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
111 ;; another mail with the same someaddress.
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
112 (unless (memq 'gnus-gravatar (text-properties-at (point)))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
113 (let ((point (point)))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
114 (unless (featurep 'xemacs)
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
115 (setq gravatar (append gravatar gnus-gravatar-properties)))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
116 (gnus-put-image gravatar (buffer-substring (point) (1+ point)) category)
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
117 (put-text-property point (point) 'gnus-gravatar address)
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
118 (gnus-add-wash-type category)
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
119 (gnus-add-image category gravatar)))))))
98ad7c9e56a3 gnus-html.el (gnus-html-image-fetched): Don't kill the temporary buffer after being called. It's apparently being killed by url.el, and killing it made point move to end-of-buffer in a random buffer.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 112235
diff changeset
120 (goto-char (marker-position mark))))))
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
121
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
122 ;;;###autoload
110958
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
123 (defun gnus-treat-from-gravatar (&optional force)
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
124 "Display gravatar in the From header.
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
125 If gravatar is already displayed, remove it."
110958
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
126 (interactive (list t)) ;; When type `W D g'
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
127 (gnus-with-article-buffer
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
128 (if (memq 'from-gravatar gnus-article-wash-types)
110958
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
129 (gnus-delete-images 'from-gravatar)
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
130 (gnus-gravatar-transform-address "from" 'from-gravatar force))))
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
131
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
132 ;;;###autoload
110958
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
133 (defun gnus-treat-mail-gravatar (&optional force)
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
134 "Display gravatars in the Cc and To headers.
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
135 If gravatars are already displayed, remove them."
110958
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
136 (interactive (list t)) ;; When type `W D h'
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
137 (gnus-with-article-buffer
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
138 (if (memq 'mail-gravatar gnus-article-wash-types)
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
139 (gnus-delete-images 'mail-gravatar)
110958
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
140 (gnus-gravatar-transform-address "cc" 'mail-gravatar force)
ea91aa0b9743 gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist.
Katsumi Yamaoka <yamaoka@jpl.org>
parents: 110957
diff changeset
141 (gnus-gravatar-transform-address "to" 'mail-gravatar force))))
110555
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
142
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
143 (provide 'gnus-gravatar)
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
144
e07971bb896c Merge changes made in Gnus trunk.
Katsumi Yamaoka <yamaoka@jpl.org>
parents:
diff changeset
145 ;;; gnus-gravatar.el ends here