Enable gnus-read-ephemeral-* to run multiple times (bug#29008)

NOTE: *DO NOT* merge this change to the trunk.

* lisp/gnus/gnus-group.el (gnus-read-ephemeral-gmane-group)
(gnus-read-ephemeral-bug-group): Make it work for any number of times
for the case `url-automatic-caching' is set (bug#29008).

diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 4a41c495900f4ae789935a31dd76fa9fcf8f41cf..56d42b41a82a5c88d2325be95ccfaa2c40628754 100644 (file)
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -2373,7 +2373,10 @@ specified by `gnus-gmane-group-download-format'."
     (with-temp-file tmpfile
       (url-insert-file-contents
        (format gnus-gmane-group-download-format
-              group start (+ start range)))
+              group start (+ start range))
+       t)
+      ;; `url-insert-file-contents' sets this because of the 2nd arg.
+      (setq buffer-file-name nil)
       (write-region (point-min) (point-max) tmpfile)
       (gnus-group-read-ephemeral-group
        (format "nndoc+ephemeral:%s.start-%s.range-%s" group start range)
@@ -2463,7 +2466,7 @@ the bug number, and browsing the URL must return mbox output."
            (if (and (not gnus-plugged)
                     (file-exists-p file))
                (insert-file-contents file)
-             (url-insert-file-contents (format mbox-url id)))))
+             (url-insert-file-contents (format mbox-url id) t))))
        ;; Add the debbugs address so that we can respond to reports easily.
        (let ((address
               (format "%s@%s" (car ids)
@@ -2488,7 +2491,9 @@ the bug number, and browsing the URL must return mbox output."
                    (insert ", " address))
                (insert "To: " address "\n")))
            (goto-char (point-max))
-           (widen)))))
+           (widen)))
+       ;; `url-insert-file-contents' sets this because of the 2nd arg.
+       (setq buffer-file-name nil)))
     (gnus-group-read-ephemeral-group
      (format "nndoc+ephemeral:bug#%s"
             (mapconcat 'number-to-string ids ","))