Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a527e8a..9965c95 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-06 18:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-newline-and-reformat): Special case for
+       breaking at BOL.
+
+2001-02-06  Per Abrahamsen  <abraham@dina.kvl.dk>
+
+       * gnus-uu.el (gnus-uu-save-article): Make the topics summary a
+       message/rfc822.
+
 2001-02-06 09:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
        * message.el (message-encode-message-body): Don't insert

diff --git a/lisp/gnus-uu.el b/lisp/gnus-uu.el
index 6b8d330..8838644 100644 (file)
--- a/lisp/gnus-uu.el
+++ b/lisp/gnus-uu.el
@@ -877,8 +877,9 @@ When called interactively, prompt for REGEXP."
            (save-excursion
              (set-buffer (gnus-get-buffer-create "*gnus-uu-pre*"))
              (erase-buffer)
-             (unless gnus-uu-digest-buffer
-               (insert (format "From: %s\nSubject: %s Digest\n\n" name name)))
+             (insert (format
+                      "Date: %s\nFrom: %s\nSubject: %s Digest\n\n"
+                      (current-time-string) name name))
              (insert "Topics:\n")))
        (when (not (eq in-state 'end))
          (setq state (list 'middle))))
@@ -925,7 +926,8 @@ When called interactively, prompt for REGEXP."
        (goto-char beg)
        (when (re-search-forward "^Subject:" nil t)
          (setq subj (nnheader-decode-subject
-                     (buffer-substring (match-end 0) (std11-field-end))))
+                     (buffer-substring (match-end 0) (std11-field-end)))))
+       (when subj
          (save-excursion
            (set-buffer "*gnus-uu-pre*")
            (insert (format "   %s\n" subj)))))

diff --git a/lisp/message.el b/lisp/message.el
index d5e4291..b53e8df 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2209,10 +2209,11 @@ With the prefix argument FORCE, insert the header anyway."
 (defun message-newline-and-reformat (&optional not-break)
   "Insert four newlines, and then reformat if inside quoted text."
   (interactive)
-  (let (quoted point beg end leading-space)
+  (let (quoted point beg end leading-space bolp)
     (setq point (point))
     (beginning-of-line)
     (setq beg (point))
+    (setq bolp (= beg point))
     ;; Find first line of the paragraph.
     (if not-break
        (while (and (not (eobp))
@@ -2227,8 +2228,9 @@ With the prefix argument FORCE, insert the header anyway."
       (setq leading-space (match-string 0)))
     (if (and quoted
             (not not-break)
+            (not bolp)
             (< (- point beg) (length quoted)))
-       ;; break in the cite prefix.
+       ;; break inside the cite prefix.
        (setq quoted nil
              end nil))
     (if quoted
@@ -2269,11 +2271,13 @@ With the prefix argument FORCE, insert the header anyway."
       (narrow-to-region beg end)
       (if not-break
          (setq point nil)
-       (insert "\n\n")
+       (if bolp
+           (insert "\n")
+         (insert "\n\n"))
        (setq point (point))
        (insert "\n\n")
        (delete-region (point) (re-search-forward "[ \t]*"))
-       (when quoted
+       (when (and quoted (not bolp))
          (insert quoted leading-space)))
       (if quoted
          (let* ((adaptive-fill-regexp

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 824c5f7..b7442e0 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2001-02-06 18:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus.texi (Top): Add Using GPG.
+
 2001-02-02  David Masterson <dmasters@Rational.Com>
 
        * gnus.texi (The Server is Down): Add link to Group Levels.

diff --git a/texi/gnus.texi b/texi/gnus.texi
index da145e9..1f011a2 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -608,6 +608,7 @@ Composing Messages
 * Posting Styles::       An easier way to specify who you are.
 * Drafts::               Postponing messages and rejected messages.
 * Rejected Articles::    What happens if the server doesn't like your article?
+* Using GPG::            How to use GPG and MML to sign and encrypt messages
 
 Select Methods