Synch to No Gnus 200509221856.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c46d039..3efae66 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,16 @@
 2005-09-22  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * spam-report.el (spam-report-url-ping-plain): Use
+       gnus-extended-version as User-Agent.
+
+       * gnus-agent.el (gnus-agent-synchronize-flags): Explain why the
+       default value is nil.
+
+       * mm-uu.el (mm-uu-type-alist): Added slrn style verbatim-marks.
+       (mm-uu-verbatim-marks-extract): New function.
+       (mm-uu-extract): New face.
+       (mm-uu-copy-to-buffer): Use it.
+
        * spam-report.el (spam-report-gmane-ham): Renamed from
        `spam-report-gmane-unspam'.
        (spam-report-gmane-internal): Renamed from `spam-report-gmane'.
@@ -21,15 +32,6 @@
        (spam-report-gmane): changed to take a single article and do
        unspam registration
 
-2005-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       * mm-view.el (mm-inline-text-html-render-with-w3m): Revert.
-
-2005-09-21  Katsumi Yamaoka  <yamaoka@jpl.org>
-
-       * mm-view.el (mm-inline-text-html-render-with-w3m): Bind
-       w3m-treat-image-size to avoid inserting excessive newlines.
-
 2005-09-20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-agent.el (gnus-agent-synchronize-flags): Switch the

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index 08426db..0dcc8c4 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -129,6 +129,8 @@ fetched will be limited to it. If not a positive integer, never consider it."
 (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."
+  ;; If the default switches to something else than nil, then the function
+  ;; should be fixed not be exceedingly slow.  See 2005-09-20 ChangeLog entry.
   :version "21.1"
   :type '(choice (const :tag "Always" t)
                 (const :tag "Never" nil)

diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index 7532bd1..a75efda 100644 (file)
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -153,7 +153,14 @@ This can be either \"inline\" or \"attachment\".")
      nil
      mm-uu-diff-extract
      nil
-     mm-uu-diff-test)))
+     mm-uu-diff-test)
+    (verbatim-marks
+     ;; slrn-style verbatim marks, see
+     ;; http://www.slrn.org/manual/slrn-manual-6.html#ss6.81
+     "^#v\\+$"
+     "^#v\\-$"
+     mm-uu-verbatim-marks-extract
+     nil)))
 
 (defcustom mm-uu-configure-list '((shar . disabled))
   "A list of mm-uu configuration.
@@ -189,9 +196,27 @@ To disable dissecting shar codes, for instance, add
 (defsubst mm-uu-function-2 (entry)
   (nth 5 entry))
 
-(defun mm-uu-copy-to-buffer (&optional from to)
+(defface mm-uu-extract
+  '((((class color)
+      (background dark))
+     (:background "gray5"))
+    (((class color)
+      (background light))
+     (:background "gray95"))
+    (t
+     ()))
+  "Face for extracted buffers."
+  ;; See `mm-uu-verbatim-marks-extract'.
+  :version "23.0" ;; No Gnus
+  :group 'gnus-article-mime)
+
+(defun mm-uu-copy-to-buffer (&optional from to properties)
   "Copy the contents of the current buffer to a fresh buffer.
-Return that buffer."
+Return that buffer.
+
+If PROPERTIES is non-nil, PROPERTIES are applied to the buffer,
+see `set-text-properties'.  If PROPERTIES equals t, this means to
+apply the face `mm-uu-extract'."
   (let ((obuf (current-buffer))
         (coding-system
          ;; Might not exist in non-MULE XEmacs
@@ -200,6 +225,11 @@ Return that buffer."
     (with-current-buffer (generate-new-buffer " *mm-uu*")
       (setq buffer-file-coding-system coding-system)
       (insert-buffer-substring obuf from to)
+      (cond ((eq properties  t)
+            (set-text-properties (point-min) (point-max)
+                                 '(face mm-uu-extract)))
+           (properties
+            (set-text-properties (point-min) (point-max) properties)))
       (current-buffer))))
 
 (defun mm-uu-configure-p  (key val)
@@ -253,6 +283,14 @@ Return that buffer."
   (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
                  '("application/postscript")))
 
+(defun mm-uu-verbatim-marks-extract ()
+  (mm-make-handle
+   (mm-uu-copy-to-buffer
+    (progn (goto-char start-point) (forward-line) (point))
+    (progn (goto-char end-point) (forward-line -1) (point))
+    t)
+   '("text/verbatim")))
+
 (defun mm-uu-emacs-sources-extract ()
   (mm-make-handle (mm-uu-copy-to-buffer start-point end-point)
                  '("application/emacs-lisp")

diff --git a/lisp/spam-report.el b/lisp/spam-report.el
index 4b37394..9fad9d2 100644 (file)
--- a/lisp/spam-report.el
+++ b/lisp/spam-report.el
@@ -200,7 +200,7 @@ the function specified by `spam-report-url-ping-function'."
       (process-send-string
        tcp-connection
        (format "GET %s HTTP/1.1\nUser-Agent: %s (spam-report.el)\nHost: %s\n\n"
-              report (gnus-emacs-version) host)))))
+              report (gnus-extended-version) host)))))
 
 ;;;###autoload
 (defun spam-report-process-queue (&optional file keep)

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 021b489..282311e 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -8,7 +8,8 @@
        (Blacklists and Whitelists, BBDB Whitelists)
        (Gmane Spam Reporting, Bogofilter, spam-stat spam filtering)
        (spam-stat spam filtering, SpamOracle)
-       (Extending the Spam ELisp package): removed extra quote symbol for clarity
+       (Extending the Spam ELisp package): Removed extra quote symbol for
+       clarity.
 
 2005-09-20  Reiner Steib  <Reiner.Steib@gmx.de>