From a09b07155be2ff60c0792759dd37c77bb294f221 Mon Sep 17 00:00:00 2001 From: ichikawa Date: Sat, 21 Mar 1998 15:07:19 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 5 ++++- lisp/gnus.el | 9 +++++---- lisp/message.el | 4 ++-- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ee9a15..25fdc8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -1998-03-20 Tatsuya Ichikawa +1998-03-20 Shuhei KOBAYASHI + + * lisp/gnus.el (gnus-version-number): Update to 6.1.1. + (gnus-version): Include corresponding SEMI version. * Sync up with Gnus 5.6.3. diff --git a/lisp/gnus.el b/lisp/gnus.el index d356374..9104200 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -246,13 +246,14 @@ is restarted, and sometimes reloaded." :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "6.0.10" +(defconst gnus-version-number "6.1.1" "Version number for this version of gnus.") - + (defconst gnus-version - (format "Semi-gnus %s (based on Gnus 5.6.3)" gnus-version-number) + (format "Semi-gnus %s (based on Gnus 5.6.3; for SEMI 1.1)" + gnus-version-number) "Version string for this version of gnus.") - + (defcustom gnus-inhibit-startup-message nil "If non-nil, the startup message will not be displayed. This variable is used before `.gnus.el' is loaded, so it should diff --git a/lisp/message.el b/lisp/message.el index 5b160c4..3b2921c 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -3079,7 +3079,7 @@ Headers already prepared in the buffer are not modified." (insert "Original-") (beginning-of-line)) (when (or (message-news-p) - (string-match "^[^@]@.+\\..+" secure-sender)) + (string-match "^[^@]+@.+\\..+" secure-sender)) (insert "Sender: " secure-sender "\n"))))))) (defun message-insert-courtesy-copy () @@ -3586,7 +3586,7 @@ responses here are directed to other newsgroups.")) ;; Make sure that this article was written by the user. (unless (string-equal (downcase - (or sender (cadr (mail-extract-address-components from)))) + (or sender (cadr (std11-extract-address-components from)))) (downcase (message-make-address))) (error "This article is not yours")) ;; Make control message. -- 1.7.10.4