* nnml.el (nnml-request-expire-articles): Use it.

* nnmail.el (nnmail-expiry-target): New variable.
(nnmail-expiry-target-group): New function.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 74238c9..d290f93 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,22 @@
+2000-04-20 14:45:20  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnml.el (nnml-request-expire-articles): Use it.
+
+       * nnmail.el (nnmail-expiry-target): New variable.
+       (nnmail-expiry-target-group): New function.
+
+2000-04-20 02:36:31  Emerick Rogul  <emerick@cs.bu.edu>
+
+       * message.el (message-forward): Add non-MIME separators.
+
+2000-04-20 02:25:39  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-generate-headers): Respect the syntax check
+       spec. 
+
+       * gnus-sum.el (gnus-remove-thread-1): Show thread.
+       (gnus-remove-thread): Don't show all threads.
+
 Thu Apr 20 01:39:25 2000  Lars Magne Ingebrigtsen  <larsi@menja.ifi.uio.no>
 
        * gnus.el: Pterodactyl Gnus v5.8.4 is released.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index dc09b56..30a3036 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2644,7 +2644,10 @@ or nil if no action could be taken."
           (expirable (if (gnus-group-total-expirable-p group)
                          (cons nil (gnus-list-of-read-articles group))
                        (assq 'expire (gnus-info-marks info))))
-          (expiry-wait (gnus-group-find-parameter group 'expiry-wait)))
+          (expiry-wait (gnus-group-find-parameter group 'expiry-wait))
+          (nnmail-expiry-target
+           (or (gnus-group-find-parameter group 'expiry-target)
+               nnmail-expiry-target)))
       (when expirable
        (setcdr
         expirable

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index fb0663f..1ab5164 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -3594,7 +3594,6 @@ If LINE, insert the rebuilt thread starting on line LINE."
                  (while thread
                    (gnus-remove-thread-1 (car thread))
                    (setq thread (cdr thread))))
-             (gnus-summary-show-all-threads)
              (gnus-remove-thread-1 thread))))))))
 
 (defun gnus-remove-thread-1 (thread)
@@ -3606,6 +3605,7 @@ If LINE, insert the rebuilt thread starting on line LINE."
       (gnus-remove-thread-1 (pop thread)))
     (when (setq d (gnus-data-find number))
       (goto-char (gnus-data-pos d))
+      (gnus-summary-show-thread)
       (gnus-data-remove
        number
        (- (gnus-point-at-bol)

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 10c4eea..005938b 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -257,7 +257,7 @@ is restarted, and sometimes reloaded."
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "5.8.4"
+(defconst gnus-version-number "5.8.5"
   "Version number for this version of Gnus.")
 
 (defconst gnus-version (format "Gnus v%s" gnus-version-number)

diff --git a/lisp/message.el b/lisp/message.el
index 7056b1b..b943ea5 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1885,6 +1885,8 @@ prefix, and don't delete any headers."
               message-indent-citation-function
             (list message-indent-citation-function)))))
     (mml-quote-region start end)
+    ;; Allow undoing.
+    (undo-boundary)
     (goto-char end)
     (when (re-search-backward message-signature-separator start t)
       ;; Also peel off any blank lines before the signature.
@@ -3082,7 +3084,7 @@ Headers already prepared in the buffer are not modified."
                  ;; The element is a symbol.  We insert the value
                  ;; of this symbol, if any.
                  (symbol-value header))
-                (t
+                ((not (message-check-element header))
                  ;; We couldn't generate a value for this header,
                  ;; so we just ask the user.
                  (read-from-minibuffer
@@ -3898,13 +3900,14 @@ Optional NEWS will use news to forward instead of mail."
     (message-goto-body)
     (if message-forward-as-mime
        (insert "\n\n<#part type=message/rfc822 disposition=inline>\n")
-      (insert "\n\n"))
+      (insert "\n-------------------- Start of forwarded message --------------------\n"))
     (let ((b (point))
          e)
       (mml-insert-buffer cur)
       (setq e (point))
-      (and message-forward-as-mime
-          (insert "<#/part>\n"))
+      (if message-forward-as-mime
+         (insert "<#/part>\n")
+       (insert "\n-------------------- End of forwarded message --------------------\n"))
       (when (and (not current-prefix-arg)
                 message-forward-ignored-headers)
        (save-restriction

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index 1b90143..2aa740b 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -166,6 +166,13 @@ Eg.:
   :type '(choice (const :tag "nnmail-expiry-wait" nil)
                 (function :format "%v" nnmail-)))
 
+(defcustom nnmail-expiry-target 'delete
+  "*Variable that says where expired messages should end up."
+    :group 'nnmail-expire
+    :type '(choice (const delete)
+                  (function :format "%v" nnmail-)
+                  string))
+
 (defcustom nnmail-cache-accepted-message-ids nil
   "If non-nil, put Message-IDs of Gcc'd articles into the duplicate cache."
   :group 'nnmail
@@ -1521,6 +1528,12 @@ See the documentation for the variable `nnmail-split-fancy' for documentation."
             ;; Compare the time with the current time.
             (ignore-errors (time-less-p days (time-since time))))))))
 
+(defun nnmail-expiry-target-group (target group)
+  (when (nnheader-functionp target)
+    (setq target (funcall target group)))
+  (unless (eq target 'delete)
+    (gnus-request-accept-article target)))
+
 (defun nnmail-check-syntax ()
   "Check (and modify) the syntax of the message in the current buffer."
   (save-restriction

diff --git a/lisp/nnml.el b/lisp/nnml.el
index 212251d..1e65975 100644 (file)
--- a/lisp/nnml.el
+++ b/lisp/nnml.el
@@ -285,6 +285,13 @@ all.  This may very well take some time.")
                         (nnmail-expired-article-p group mod-time force
                                                   nnml-inhibit-expiry)))
              (progn
+               ;; Allow a special target group.
+               (unless (eq nnmail-expiry-target 'delete)
+                 (with-temp-buffer
+                   (nnml-request-article article group server
+                                         (current-buffer))
+                   (nnmail-expiry-target-group
+                    nnmail-expiry-target group)))
                (nnheader-message 5 "Deleting article %s in %s"
                                  article group)
                (condition-case ()