*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 3ab41ac..1c5c75f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,24 @@
-1998-05-03  Tatsuya Ichikawa  <t-ichi@po.shiojiri.ne.jp>
+1998-05-04  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * lisp/gnus.el (gnus-version-number): Update to 6.3.0.
+       (gnus-version): Modify for SEMI 1.4.
+
+       * lisp/gnus-sum.el: Use 'mime-add-condition to set up
+       acting-condition.
+
+1998-05-04  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * lisp/lpath.el: Must add "flim" instead of "mel" to load-path.
+
+1998-05-03  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * lisp/gnus.el (gnus-version-number): Update to 6.2.5.
-       * Sync up with Gnus 5.6.9.
+
+       * texi/gnus.texi, lisp/ChangeLog: Sync up with Gnus v5.6.9.
+
+       * lisp/gnus.el, lisp/message.el, lisp/gnus-sum.el,
+       lisp/gnus-msg.el, lisp/gnus-draft.el, lisp/gnus-agent.el: Sync up
+       with Gnus v5.6.9.
 
 1998-04-30  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index cbcc92e..e665fcb 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8954,13 +8954,12 @@ save those articles instead."
   "mime-partial"
   "Internal method to combine message/partial messages automatically.")
 
-(ctree-set-calist-strictly
- 'mime-acting-condition
- '((type . message)(subtype . partial)
-   (method . mime-method-to-combine-message/partial-pieces)
-   (major-mode . gnus-original-article-mode)
-   (summary-buffer-exp . gnus-summary-buffer)
-   ))
+(mime-add-condition
+ 'action '((type . message)(subtype . partial)
+          (method . mime-method-to-combine-message/partial-pieces)
+          (major-mode . gnus-original-article-mode)
+          (summary-buffer-exp . gnus-summary-buffer)
+          ))
 
 (set-alist 'mime-view-partial-message-method-alist
           'gnus-original-article-mode

diff --git a/lisp/gnus.el b/lisp/gnus.el
index 1d11e1e..c76a413 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -250,11 +250,11 @@ is restarted, and sometimes reloaded."
   :link '(custom-manual "(gnus)Exiting Gnus")
   :group 'gnus)
 
-(defconst gnus-version-number "6.2.5"
+(defconst gnus-version-number "6.3.0"
   "Version number for this version of gnus.")
-  
+
 (defconst gnus-version
-  (format "Semi-gnus %s (based on Gnus 5.6.9; for SEMI 1.3)"
+  (format "Semi-gnus %s (based on Gnus 5.6.9; for SEMI 1.4)"
           gnus-version-number)
   "Version string for this version of gnus.")
 

diff --git a/lisp/lpath.el b/lisp/lpath.el
index ebd9174..b4b458c 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -5,7 +5,7 @@
 (or (featurep 'path-util)
     (load "apel/path-util"))
 (add-path "apel")
-(add-path "mel")
+(add-path "flim")
 (add-path "semi")
 
 (defun maybe-fbind (args)

diff --git a/lisp/message.el b/lisp/message.el
index d116370..4aa804b 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -3096,7 +3096,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 ()

diff --git a/texi/gnus.texi b/texi/gnus.texi
index 5c5ab42..55b01a4 100644 (file)
--- a/texi/gnus.texi
+++ b/texi/gnus.texi
@@ -15719,7 +15719,7 @@ actually are people who are using Gnus.  Who'd'a thunk it!
 * ding Gnus::          New things in Gnus 5.0/5.1, the first new Gnus.
 * September Gnus::     The Thing Formally Known As Gnus 5.3/5.3.
 * Red Gnus::           Third time best---Gnus 5.4/5.5.
-* Quassia Gnus::       Two times two is four, or Gnus 5.6.7.
+* Quassia Gnus::       Two times two is four, or Gnus 5.6.9.
 @end menu
 
 These lists are, of course, just @emph{short} overviews of the
@@ -16254,7 +16254,7 @@ Emphasized text can be properly fontisized:
 @node Quassia Gnus
 @subsubsection Quassia Gnus
 
-New features in Gnus 5.6.7:
+New features in Gnus 5.6.9:
 
 @itemize @bullet