Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 46e4a9a..2e5d370 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-01-21  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * message.el (message-send-hook): Doc fix.
+
+       * gnus-win.el (gnus-buffer-configuration): Display article
+       instead of article-copy when `reply'.
+
 2003-01-21  Jesper Harder  <harder@ifa.au.dk>
 
        * gnus.el (gnus-format): Change customize group to gnus.

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index f6d452a..f7eafe9 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -6032,7 +6032,8 @@ If EXCLUDE-GROUP, do not go to this group."
                      (progn
                        (while arts
                          (when (or (and undownloaded
-                                        (memq (car arts) gnus-newsgroup-undownloaded))
+                                        (memq (car arts)
+                                              gnus-newsgroup-undownloaded))
                                    (gnus-data-unread-p (car arts)))
                            (setq result (car arts)
                                  arts nil))

diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el
index c84a42c..ab6fb9c 100644 (file)
--- a/lisp/gnus-win.el
+++ b/lisp/gnus-win.el
@@ -123,7 +123,7 @@ used to display Gnus windows."
               (post 1.0 point)))
     (reply
      (vertical 1.0
-              (article-copy 0.5)
+              (article 0.5)
               (message 1.0 point)))
     (forward
      (vertical 1.0

diff --git a/lisp/message.el b/lisp/message.el
index ecea126..05a3ccc 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1385,18 +1385,23 @@ candidates:
 The cdr of each entry is a function for applying the face to a region.")
 
 (defcustom message-send-hook nil
-  "Hook run before sending messages."
+  "Hook run before sending messages.
+This hook is run quite early when sending."
   :group 'message-various
   :options '(ispell-message)
   :type 'hook)
 
 (defcustom message-send-mail-hook nil
-  "Hook run before sending mail messages."
+  "Hook run before sending mail messages.
+This hook is run very late -- just before the message is sent as
+mail."
   :group 'message-various
   :type 'hook)
 
 (defcustom message-send-news-hook nil
-  "Hook run before sending news messages."
+  "Hook run before sending news messages.
+This hook is run very late -- just before the message is sent as
+news."
   :group 'message-various
   :type 'hook)
 

diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index ddfac80..d416836 100644 (file)
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -1859,11 +1859,13 @@ gnus \e$B$,F0:n$7$F$$$J$$$H$-$K\e(B Message \e$B$,%P%C%U%!$r<+F0J]B8$9$k%G%#%l%/%H%
 
 @item message-send-mail-hook
 @vindex message-send-mail-hook
-\e$B%a!<%k%a%C%;!<%8$rAw$kA0$K<B9T$5$l$k%U%C%/$G$9!#\e(B
+\e$B%a!<%k%a%C%;!<%8$rAw$kA0$K<B9T$5$l$k%U%C%/$G$9!#$3$N%U%C%/$OHs>o$KCY$$;~\e(B
+\e$B4|\e(B - \e$B%a%C%;!<%8$,%a!<%k$H$7$F<B:]$KAw?.$5$l$kD>A0\e(B -- \e$B$K<B9T$5$l$^$9!#\e(B
 
 @item message-send-news-hook
 @vindex message-send-news-hook
-\e$B%K%e!<%9%a%C%;!<%8$rAw$kA0$K<B9T$5$l$k%U%C%/$G$9!#\e(B
+\e$B%K%e!<%9%a%C%;!<%8$rAw$kA0$K<B9T$5$l$k%U%C%/$G$9!#$3$N%U%C%/$OHs>o$KCY$$\e(B
+\e$B;~4|\e(B - \e$B%a%C%;!<%8$,%K%e!<%9$H$7$F<B:]$KAw?.$5$l$kD>A0\e(B -- \e$B$K<B9T$5$l$^$9!#\e(B
 
 @item message-sent-hook
 @vindex message-sent-hook

diff --git a/texi/message.texi b/texi/message.texi
index 1d9732c..625748c 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1875,11 +1875,13 @@ This function won't add the header if the header is already present.
 
 @item message-send-mail-hook
 @vindex message-send-mail-hook
-Hook run before sending mail messages.
+Hook run before sending mail messages.  This hook is run very late --
+just before the message is actually sent as mail.
 
 @item message-send-news-hook
 @vindex message-send-news-hook
-Hook run before sending news messages.
+Hook run before sending news messages.  This hook is run very late --
+just before the message is actually sent as news.
 
 @item message-sent-hook
 @vindex message-sent-hook