From d715adda2809176649227153d9e97564e755efb6 Mon Sep 17 00:00:00 2001 From: Julien Danjou Date: Fri, 25 Feb 2011 16:48:27 +0100 Subject: [PATCH] Fix gravatar insertion in dead article buffers Signed-off-by: Julien Danjou --- lisp/ChangeLog | 7 +++++++ lisp/gnus-art.el | 7 ++++--- lisp/gnus-gravatar.el | 3 +-- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 26db1188e..1632895f9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -42,6 +42,13 @@ * gnus-demon.el (gnus-demon-init): run-with-timer should be called with numerical parameters. +2011-02-25 Julien Danjou + + * gnus-gravatar.el: Use gnus-with-article-buffer. + + * gnus-art.el (gnus-with-article-buffer): Check that the + gnus-article-buffer is alive. + 2011-02-24 Teodor Zlatanov * auth-source.el (auth-source-creation-prompts): New variable to manage diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 5b3489a72..250ebaf3f 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -1725,9 +1725,10 @@ Initialized from `text-mode-syntax-table.") (put 'gnus-with-article-headers 'edebug-form-spec '(body)) (defmacro gnus-with-article-buffer (&rest forms) - `(with-current-buffer gnus-article-buffer - (let ((inhibit-read-only t)) - ,@forms))) + `(when (buffer-live-p gnus-article-buffer) + (with-current-buffer gnus-article-buffer + (let ((inhibit-read-only t)) + ,@forms)))) (put 'gnus-with-article-buffer 'lisp-indent-function 0) (put 'gnus-with-article-buffer 'edebug-form-spec '(body)) diff --git a/lisp/gnus-gravatar.el b/lisp/gnus-gravatar.el index 7208889a1..98b1f3bd1 100644 --- a/lisp/gnus-gravatar.el +++ b/lisp/gnus-gravatar.el @@ -80,9 +80,8 @@ 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) - (with-current-buffer gnus-article-buffer + (gnus-with-article-buffer (let ((mark (point-marker)) - (inhibit-read-only t) (inhibit-point-motion-hooks t) (case-fold-search t)) (save-restriction -- 2.25.1