Fix previous merge from Gnus trunk.

diff --git a/doc/misc/message.texi b/doc/misc/message.texi
index 8374ed05223c506d43ada0b8ac6e06d29d66b54d..d411953387038206f5593478cabf1d80807d9f41 100644 (file)
--- 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 f568d67334547c86ec76932962f287e0c830d083..576d8835dcc28064b323d6347bff2e2cb9f7c94a 100644 (file)
--- 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)