From 2bff712bdcfaca2bcd25e2ab8d1bb957a649f590 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 16 Jan 2001 00:15:24 +0000 Subject: [PATCH] Synch with Oort Gnus. --- ChangeLog | 4 ++++ lisp/ChangeLog | 9 +++++++++ lisp/gnus-art.el | 2 ++ lisp/message.el | 5 ++++- make.bat | 8 ++++++-- texi/message-ja.texi | 5 ++--- texi/message.texi | 5 ++--- 7 files changed, 29 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index c37134c..9095f01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2001-01-15 Jesper Harder + + * make.bat: Fix doc. + 2001-01-15 Katsumi Yamaoka * lisp/nnheader.el: Require `pces', `poem' and `std11' to reduce diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 96aa9d0..4abf466 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2001-01-15 16:00:00 ShengHuo ZHU + + * gnus-art.el (article-display-x-face): Use + gnus-original-article-buffer. + +2001-01-15 Jack Twilley + + * message.el (message-add-header): Move to point-max. + 2001-01-15 Simon Josefsson * 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 --- 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 --- 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 --- a/make.bat +++ b/make.bat @@ -60,12 +60,16 @@ cd .. goto end :usage -echo Usage: make ^ [copy] +echo Usage: make :emacs-dir: [copy] echo. -echo where: ^ is the directory you installed emacs in +echo where: :emacs-dir: is the directory you installed emacs in echo eg. d:\emacs\20.4 echo copy indicates that the compiled files should be copied to your echo emacs lisp, info, and etc directories +echo. +echo Note: If you have Emacs/w3 you should set the environment variable +echo W3DIR to the directory where w3 is installed eg. +echo set W3DIR=d:\lisp\w3-4.0pre46\lisp rem Restore PWD so whoever called this batch file doesn't get confused set PWD=%GNUS_PWD_SAVE% diff --git a/texi/message-ja.texi b/texi/message-ja.texi index aa7ae82..06e3288 100644 --- a/texi/message-ja.texi +++ b/texi/message-ja.texi @@ -1286,9 +1286,8 @@ follows this line--} です。 @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 この関数は、ヘッダーが既に存在している場合はヘッダーを加えません。 diff --git a/texi/message.texi b/texi/message.texi index ffe8fa0..d5a6c43 100644 --- 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. -- 1.7.10.4