Synch to No Gnus 200409302212.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0bab734..065ac9a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2004-10-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * spam-report.el (spam-report-gmane): Fix interactive.
+
+       * gnus-art.el (gnus-treat-body-boundary): Only do stuff under X. 
+
+       * gnus-agent.el (gnus-agent-synchronize-flags-server): Be silent
+       when writing file.
+       (gnus-agent-synchronize-flags): Don't default to being
+       interactive. 
+
 2004-09-30  Simon Josefsson  <jas@extundo.com>
 
        * message.el (message-generate-hashcash): Add.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index b4b46e9..35424d3 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -125,7 +125,7 @@ fetched will be limited to it. If not a positive integer, never consider it."
   :type '(choice (const nil)
                 (integer :tag "Number")))
 
-(defcustom gnus-agent-synchronize-flags 'ask
+(defcustom gnus-agent-synchronize-flags nil
   "Indicate if flags are synchronized when you plug in.
 If this is `ask' the hook will query the user."
   :version "21.1"
@@ -859,7 +859,8 @@ be a select method."
                (delete-file (gnus-agent-lib-file "flags")))
               (error
                (let ((file (gnus-agent-lib-file "flags")))
-                 (write-file file)
+                 (write-region (point-min) (point-max)
+                               (gnus-agent-lib-file "flags") nil 'silent)
                  (error "Couldn't set flags from file %s due to %s"
                         file (error-message-string err)))))))
       (kill-buffer nil))))

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 55e12a2..dffa6f3 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1367,9 +1367,10 @@ See Info node `(gnus)Customizing Articles' and Info node
 (put 'gnus-treat-newsgroups-picon 'highlight t)
 
 (defcustom gnus-treat-body-boundary
-  (if (or gnus-treat-newsgroups-picon
-         gnus-treat-mail-picon
-         gnus-treat-from-picon)
+  (if (and (eq window-system 'x)
+          (or gnus-treat-newsgroups-picon
+              gnus-treat-mail-picon
+              gnus-treat-from-picon))
       'head nil)
   "Draw a boundary at the end of the headers.
 Valid values are nil and `head'.

diff --git a/lisp/spam-report.el b/lisp/spam-report.el
index ebc0eb3..97255f7 100644 (file)
--- a/lisp/spam-report.el
+++ b/lisp/spam-report.el
@@ -120,7 +120,7 @@ Reports is as ham when HAM is set."
 
 (defun spam-report-gmane (&rest articles)
   "Report an article as spam through Gmane."
-  (interactive (gnus-summary-work-articles prefix-arg))
+  (interactive (gnus-summary-work-articles current-prefix-arg))
   (dolist (article articles)
     (when (and gnus-newsgroup-name
               (or (null spam-report-gmane-regex)