Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6f89a07..5afc43d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2001-03-17 10:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-setup-fill-variables): Use
+       fill-paragraph-function.
+       (message-fill-paragraph): Take an argument.
+       (message-newline-and-reformat): Take another argument.
+
+2001-03-16 20:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (rmail-output): It is in rmailout.el not rmail.el.
+
+2001-03-16 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * message.el (message-forward): local-variable-p takes an extra
+       argument in XEmacs.
+
 2001-03-16  Simon Josefsson  <simon@josefsson.org>
 
        * nnimap.el (nnimap-dont-use-nov-p): Renamed from

diff --git a/lisp/message.el b/lisp/message.el
index c85de29..7a514cb 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1454,7 +1454,7 @@ Except if it is nil, use Gnus native MUA; if it is t, use
   (autoload 'gnus-copy-article-buffer "gnus-msg")
   (autoload 'gnus-alive-p "gnus-util")
   (autoload 'gnus-group-name-charset "gnus-group")
-  (autoload 'rmail-output "rmail")
+  (autoload 'rmail-output "rmailout")
   (autoload 'mu-cite-original "mu-cite"))
 
 \f
@@ -1832,7 +1832,7 @@ Point is left at the beginning of the narrowed-to region."
   (define-key message-mode-map "\C-c\C-v" 'message-delete-not-region)
   (define-key message-mode-map "\C-c\C-z" 'message-kill-to-signature)
   (define-key message-mode-map "\M-\r" 'message-newline-and-reformat)
-  (define-key message-mode-map "\M-q" 'message-fill-paragraph)
+  ;;(define-key message-mode-map "\M-q" 'message-fill-paragraph)
 
   (define-key message-mode-map "\t" 'message-tab)
   (define-key message-mode-map "\M-;" 'comment-region)
@@ -1986,6 +1986,8 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
 
 (defun message-setup-fill-variables ()
   "Setup message fill variables."
+  (set (make-local-variable 'fill-paragraph-function) 
+       'message-fill-paragraph)
   (make-local-variable 'paragraph-separate)
   (make-local-variable 'paragraph-start)
   (make-local-variable 'adaptive-fill-regexp)
@@ -2215,9 +2217,10 @@ With the prefix argument FORCE, insert the header anyway."
     (unless (bolp)
       (insert "\n"))))
 
-(defun message-newline-and-reformat (&optional not-break)
-  "Insert four newlines, and then reformat if inside quoted text."
-  (interactive)
+(defun message-newline-and-reformat (&optional arg not-break)
+  "Insert four newlines, and then reformat if inside quoted text.
+Prefix arg means justify as well."
+  (interactive (list (if current-prefix-arg 'full)))
   (let (quoted point beg end leading-space bolp)
     (setq point (point))
     (beginning-of-line)
@@ -2293,14 +2296,15 @@ With the prefix argument FORCE, insert the header anyway."
                 (regexp-quote (concat quoted leading-space)))
                 (adaptive-fill-first-line-regexp
                  adaptive-fill-regexp ))
-           (fill-paragraph nil))
-       (fill-paragraph nil))
+           (fill-paragraph arg))
+       (fill-paragraph arg))
       (if point (goto-char point)))))
 
-(defun message-fill-paragraph ()
+(defun message-fill-paragraph (&optional arg)
   "Like `fill-paragraph'."
-  (interactive)
-  (message-newline-and-reformat t))
+  (interactive (list (if current-prefix-arg 'full)))
+  (message-newline-and-reformat arg t)
+  t)
 
 (defun message-insert-signature (&optional force)
   "Insert a signature.  See documentation for variable `message-signature'."

diff --git a/texi/ChangeLog b/texi/ChangeLog
index 6f6173a..fd4da26 100644 (file)
--- a/texi/ChangeLog
+++ b/texi/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-17  Matthias Wiehl  <mwiehl@gmx.de>
+
+       * message.texi (Security): Typos.
+
 2001-03-15  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 
        * gnus.texi (Hiding Headers): Typos.  Reported by Sriram Karra

diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index 1fcee67..5c8ecf3 100644 (file)
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -703,8 +703,8 @@ care in handling it.
 
 @subsection Using PGP/MIME
 
-PGP/MIME require an external OpenPGP implementation, such as GNU Privacy
-Guard (@code{http://www.gnupg.org/}.  It also require a Emacs interface
+PGP/MIME requires an external OpenPGP implementation, such as GNU Privacy
+Guard (@code{http://www.gnupg.org/}).  It also requires an Emacs interface
 to it, such as Mailcrypt (available from
 @code{http://www.nb.net/~lbudney/linux/software/mailcrypt.html}) or
 Florian Weimer's @code{gpg.el}.

diff --git a/texi/message.texi b/texi/message.texi
index ecfc841..9e7fc67 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -720,9 +720,9 @@ care in handling it.
 
 @subsection Using PGP/MIME
 
-PGP/MIME require an external OpenPGP implementation, such as GNU Privacy
-Guard (@code{http://www.gnupg.org/}.  It also require a Emacs interface
-to it, such as Mailcrypt (available from
+PGP/MIME requires an external OpenPGP implementation, such as GNU
+Privacy Guard (@code{http://www.gnupg.org/}).  It also requires an Emacs
+interface to it, such as Mailcrypt (available from
 @code{http://www.nb.net/~lbudney/linux/software/mailcrypt.html}) or
 Florian Weimer's @code{gpg.el}.