Synch with Oort Gnus.

* message.el (message-resend, message-send): Undo.

diff --git a/ChangeLog b/ChangeLog
index efe637f..04b7fec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2001-10-19  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * lisp/message.el (message-resend, message-send): Undo.
+
+2001-10-19  Katsumi Yamaoka  <yamaoka@jpl.org>
+
        * lisp/message.el (message-resend): Bind
        `inhibit-field-text-motion' to t while resending a mail.
 

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 63977e8..f571cc2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,8 +1,18 @@
 2001-10-19  Per Abrahamsen  <abraham@dina.kvl.dk>
 
+       * message.el (message-do-auto-fill): New version that does not
+       rely on text properties, by Simon Josefsson <jas@extundo.com>. 
+       (message-setup-1): Removed the `message-field' property.
+
+       * gnus-draft.el (gnus-draft-edit-message): Removed the
+       `message-field' property.
+
+2001-10-19  Per Abrahamsen  <abraham@dina.kvl.dk>
+
        * gnus-draft.el (gnus-draft-edit-message): Change `field' to
        `message-field'.  The `field' property has a special significance in
        Emacs 21.
+
        * message.el (message-send, message-setup-1): Ditto.
 
 2001-10-18  Simon Josefsson  <jas@extundo.com>

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 20660b7..9fa69b5 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -103,8 +103,7 @@
     (save-excursion
       (save-restriction
        (message-narrow-to-headers)
-       (message-remove-header "date")
-       (put-text-property (point-min) (point-max) 'message-field 'header)))
+       (message-remove-header "date")))
     (message-save-drafts)
     (let ((gnus-verbose-backends nil))
       (gnus-request-expire-articles (list article) group t))

diff --git a/lisp/message.el b/lisp/message.el
index fe109bb..cb3aa04 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2202,8 +2202,7 @@ Prefix arg means justify as well."
 
 (defun message-do-auto-fill ()
   "Like `do-auto-fill', but don't fill in message header."
-  (unless (text-property-any (gnus-point-at-bol) (point)
-                            'message-field 'header)
+  (when (> (point) (save-excursion (rfc822-goto-eoh)))
     (do-auto-fill)))
 
 (defun message-insert-signature (&optional force)
@@ -2772,11 +2771,9 @@ It should typically alter the sending method in some way or other."
        (set-buffer message-encoding-buffer)
        (erase-buffer)
        ;; ;; Avoid copying text props.
-       ;; T-gnus change: copy all text props, except for `field', from
-       ;; the editing buffer into the encoding buffer.  `field' is the
-       ;; special text property on Emacs 21, see NEWS for details.
+       ;; T-gnus change: copy all text props from the editing buffer
+       ;; into the encoding buffer.
        (insert-buffer message-edit-buffer)
-       (put-text-property (point-min) (point-max) 'field nil)
        (funcall message-encode-function)
        (while (and success
                    (setq elem (pop alist)))
@@ -4675,9 +4672,6 @@ than 988 characters long, and if they are not, trim them until they are."
   (set-buffer-modified-p nil)
   (setq buffer-undo-list nil)
   (run-hooks 'message-setup-hook)
-  (save-restriction
-    (message-narrow-to-headers)
-    (put-text-property (point-min) (point-max) 'field 'header))
   (message-position-point)
   (undo-boundary))
 
@@ -5428,8 +5422,7 @@ Optional NEWS will use news to forward instead of mail."
       ;; Send it.
       (let ((message-encoding-buffer (current-buffer))
            (message-edit-buffer (current-buffer))
-           message-required-mail-headers
-           (inhibit-field-text-motion t))
+           message-required-mail-headers)
        (message-send-mail))
       (kill-buffer (current-buffer)))
     (message "Resending message to %s...done" address)))