Synch with Oort Gnus.

diff --git a/ChangeLog b/ChangeLog
index c37134c..9095f01 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2001-01-15  Jesper Harder <harder@ifa.au.dk>
+
+       * make.bat: Fix doc.
+
 2001-01-15  Katsumi Yamaoka <yamaoka@jpl.org>
 
        * lisp/nnheader.el: Require `pces', `poem' and `std11' to reduce

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 96aa9d0..4abf466 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2001-01-15 16:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * gnus-art.el (article-display-x-face): Use
+       gnus-original-article-buffer.
+
+2001-01-15  Jack Twilley <jmt@tbe.net>
+
+       * message.el (message-add-header): Move to point-max.
+
 2001-01-15  Simon Josefsson  <simon@josefsson.org>
 
        * smime.el (smime-CA-directory, smime-CA-file): Change default to

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 2a7e012..36c80f8 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -1704,6 +1704,8 @@ MAP is an alist where the elements are on the form (\"from\" \"to\")."
     (let ((inhibit-point-motion-hooks t)
          (case-fold-search t)
          from last)
+      (if (gnus-buffer-live-p gnus-original-article-buffer)
+         (set-buffer gnus-original-article-buffer))
       (save-restriction
        (article-narrow-to-head)
        (goto-char (point-min))

diff --git a/lisp/message.el b/lisp/message.el
index e46c768..3f50cb5 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1568,7 +1568,10 @@ is used by default."
       (save-restriction
        (message-narrow-to-headers)
        (unless (re-search-forward (concat "^" (regexp-quote hclean) ":") nil t)
-         (insert (car headers) ?\n))))
+         (goto-char (point-max))
+         (if (string-match "\n$" (car headers))
+             (insert (car headers))
+           (insert (car headers) ?\n)))))
     (setq headers (cdr headers))))
 
 

diff --git a/make.bat b/make.bat
index b186705..9e31066 100755 (executable)
--- a/make.bat
+++ b/make.bat
@@ -60,12 +60,16 @@ cd ..
 goto end\r
 \r
 :usage\r
-echo Usage: make ^<emacs-dir^> [copy]\r
+echo Usage: make :emacs-dir: [copy]\r
 echo.\r
-echo where: ^<emacs-dir^> is the directory you installed emacs in\r
+echo where: :emacs-dir: is the directory you installed emacs in\r
 echo                    eg. d:\emacs\20.4\r
 echo        copy indicates that the compiled files should be copied to your\r
 echo             emacs lisp, info, and etc directories\r
+echo.\r
+echo Note: If you have Emacs/w3 you should set the environment variable \r
+echo       W3DIR to the directory where w3 is installed eg.\r
+echo                 set W3DIR=d:\lisp\w3-4.0pre46\lisp\r
 \r
 rem Restore PWD so whoever called this batch file doesn't get confused\r
 set PWD=%GNUS_PWD_SAVE%\r

diff --git a/texi/message-ja.texi b/texi/message-ja.texi
index aa7ae82..06e3288 100644 (file)
--- a/texi/message-ja.texi
+++ b/texi/message-ja.texi
@@ -1286,9 +1286,8 @@ follows this line--} \e$B$G$9!#\e(B
 @lisp
 (add-hook 'message-send-hook 'my-message-add-content)
 (defun my-message-add-content ()
-  (message-add-header
-   "X-In-No-Sense: Nonsense"
-   "X-Whatever: no"))
+  (message-add-header "X-In-No-Sense: Nonsense")
+  (message-add-header "X-Whatever: no"))
 @end lisp
 
 \e$B$3$N4X?t$O!"%X%C%@!<$,4{$KB8:_$7$F$$$k>l9g$O%X%C%@!<$r2C$($^$;$s!#\e(B

diff --git a/texi/message.texi b/texi/message.texi
index ffe8fa0..d5a6c43 100644 (file)
--- a/texi/message.texi
+++ b/texi/message.texi
@@ -1325,9 +1325,8 @@ If you want to add certain headers before sending, you can use the
 @lisp
 (add-hook 'message-send-hook 'my-message-add-content)
 (defun my-message-add-content ()
-  (message-add-header
-   "X-In-No-Sense: Nonsense"
-   "X-Whatever: no"))
+  (message-add-header "X-In-No-Sense: Nonsense")
+  (message-add-header "X-Whatever: no"))
 @end lisp
 
 This function won't add the header if the header is already present.