From 0a46a12f7a484e3fab96ea2f46fa738e90dabf1c Mon Sep 17 00:00:00 2001 From: Katsumi Yamaoka Date: Wed, 1 Sep 2010 00:18:24 +0000 Subject: [PATCH] Fix previous merge from Gnus trunk. --- doc/misc/message.texi | 4 ++-- lisp/gnus/gnus-html.el | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/misc/message.texi b/doc/misc/message.texi index 8374ed05223..d4119533870 100644 --- a/doc/misc/message.texi +++ b/doc/misc/message.texi @@ -200,7 +200,7 @@ To avoid this, do something like the following: @lisp (setq message-prune-recipient-rules - '(("^\\([^@]+\\)@\\(.*\\)" "\\1@.*[.]\\2"))) + '(("^\\([^@@]+\\)@@\\(.*\\)" "\\1@@.*[.]\\2"))) @end lisp If, for instance, you want all wide replies that involve messages from @@ -210,7 +210,7 @@ recipient list: @lisp (setq message-prune-recipient-rules - '(("cvs@example.org" "."))) + '(("cvs@@example.org" "."))) @end lisp @vindex message-wide-reply-confirm-recipients diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el index f568d673345..576d8835dcc 100644 --- a/lisp/gnus/gnus-html.el +++ b/lisp/gnus/gnus-html.el @@ -171,8 +171,8 @@ (defun gnus-html-curl-sentinel (process event) (when (string-match "finished" event) - (let* ((images (gnus-process-get process 'images)) - (buffer (gnus-process-get process 'buffer)) + (let* ((images (process-get process 'images)) + (buffer (process-get process 'buffer)) (spec (pop images)) (file (gnus-html-image-id (car spec)))) (when (and (buffer-live-p buffer) -- 2.39.2