Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e58570e..63977e8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+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>
 
        * gnus-sum.el (gnus-group-make-articles-read): Call g-r-set-mark

diff --git a/lisp/gnus-draft.el b/lisp/gnus-draft.el
index 2cad719..20660b7 100644 (file)
--- a/lisp/gnus-draft.el
+++ b/lisp/gnus-draft.el
@@ -1,5 +1,5 @@
 ;;; gnus-draft.el --- draft message support for Semi-gnus
-;; Copyright (C) 1997, 1998, 1999, 2000
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001
 ;;        Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -104,7 +104,7 @@
       (save-restriction
        (message-narrow-to-headers)
        (message-remove-header "date")
-       (put-text-property (point-min) (point-max) 'field 'header)))
+       (put-text-property (point-min) (point-max) 'message-field 'header)))
     (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 bd0265f..fe109bb 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -2202,7 +2202,8 @@ 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) 'field 'header)
+  (unless (text-property-any (gnus-point-at-bol) (point)
+                            'message-field 'header)
     (do-auto-fill)))
 
 (defun message-insert-signature (&optional force)