diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-01 00:18:24 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-01 00:18:24 +0000 |
| commit | 0a46a12f7a484e3fab96ea2f46fa738e90dabf1c (patch) | |
| tree | 3a0d3d41dcc4801841e1719c06ed4a814bf41867 | |
| parent | c7e663544a3c525f3edf8b456647344e63a8ffe0 (diff) | |
| download | emacs-0a46a12f7a484e3fab96ea2f46fa738e90dabf1c.tar.gz emacs-0a46a12f7a484e3fab96ea2f46fa738e90dabf1c.tar.bz2 emacs-0a46a12f7a484e3fab96ea2f46fa738e90dabf1c.zip | |
Fix previous merge from Gnus trunk.
| -rw-r--r-- | doc/misc/message.texi | 4 | ||||
| -rw-r--r-- | 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) |