(gnus-article-copy-string): Say what data we copied; (gnus-html-wash-tags): Remove even more white space around <pre_int>; (gnus-agent-load-alist): Check whether the agentview files exist before trying to read them.

4 files changed, 20 insertions, 9 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c18cf19aaed..d5cdb241bec 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,13 @@
 2010-09-04  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * gnus-agent.el (gnus-agent-load-alist): Check whether the agentview
+        files exist before trying to read them.
+
+        * gnus-html.el (gnus-html-wash-tags): Remove even more white space
+        around <pre_int>.
+
+        * gnus-art.el (gnus-article-copy-string): Say what data we copied.
+
         * nnmh.el (nnmh-request-list-1): Optimize for speed.
 
 2010-09-03  Lars Magne Ingebrigtsen  <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 96a62e61552..c5232819379 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -2108,13 +2108,15 @@ doesn't exist, to valid the overview buffer."
 (defun gnus-agent-load-alist (group)
   "Load the article-state alist for GROUP."
   ;; Bind free variable that's used in `gnus-agent-read-agentview'.
-  (let ((gnus-agent-read-agentview group)
-        (file-name-coding-system nnmail-pathname-coding-system))
-    (setq gnus-agent-article-alist
-          (gnus-cache-file-contents
-           (gnus-agent-article-name ".agentview" group)
-           'gnus-agent-file-loading-cache
-           'gnus-agent-read-agentview))))
+  (let* ((gnus-agent-read-agentview group)
+         (file-name-coding-system nnmail-pathname-coding-system)
+         (agentview (gnus-agent-article-name ".agentview" group)))
+    (when (file-exists-p agentview)
+      (setq gnus-agent-article-alist
+            (gnus-cache-file-contents
+             agentview
+             'gnus-agent-file-loading-cache
+             'gnus-agent-read-agentview)))))
 
 (defun gnus-agent-read-agentview (file)
   "Load FILE and do a `read' there."
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 944e65dfe8e..bfdb9bd6b63 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -7949,7 +7949,8 @@ url is put as the `gnus-button-url' overlay property on the button."
     (when data
       (with-temp-buffer
         (insert data)
-        (copy-region-as-kill (point-min) (point-max))))))
+        (copy-region-as-kill (point-min) (point-max))
+        (message "Copied %s" data)))))
 
 ;;; Internal functions:
 
diff --git a/lisp/gnus/gnus-html.el b/lisp/gnus/gnus-html.el
index e14d109d6ed..f7eb05bf8b7 100644
--- a/lisp/gnus/gnus-html.el
+++ b/lisp/gnus/gnus-html.el
@@ -112,7 +112,7 @@ fit these criteria."
 (defun gnus-html-wash-tags ()
   (let (tag parameters string start end images url)
     (goto-char (point-min))
-    (while (re-search-forward " *<pre_int> *</pre_int>\n" nil t)
+    (while (re-search-forward " *<pre_int> *</pre_int> *\n" nil t)
       (replace-match "" t t))
     (goto-char (point-min))
     (while (re-search-forward "<\\([^ />]+\\)\\([^>]*\\)>" nil t)