Merge emh-1_10_1_1.

diff --git a/ChangeLog b/ChangeLog
index 5ddc175..2a08f39 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,46 @@
+2000-01-05  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * Makefile, README.en: Update for the new CVS server.
+
+1999-12-13  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * README.en: Update for the recent ML address and ftp site.
+
+\f
+1999-11-11  MORIOKA Tomohiko  <tomo@etl.go.jp>
+
+       * EMH: Version 1.10.1 was released.
+
+1999-09-13  MORIOKA Tomohiko  <tomo@m17n.org>
+
+       * emh-comp.el (gnus-article-buffer): Deleted.
+       (gnus-article-copy): Deleted.
+       (gnus-original-article-buffer): Deleted.
+       (gnus-copy-article-buffer): Deleted.
+       (emh-message-yank-function): Deleted.
+       (emh-yank-current-message): Deleted.
+
+1999-08-25  Katsumi Yamaoka   <yamaoka@jpl.org>
+
+       * emh-comp.el: Don't require `gnus'.  Bind some variables and
+       function of gnus instead.
+
+\f
+1998-10-23  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * EMH: Version 1.10.0 was released.
+
+1998-10-21  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+       * emh-comp.el: Require `gnus' when compiling.
+
+       * README.en (What's EMH?): Modify for SEMI 1.10.0.
+
+       * emh.el: Don't require `mime-text' when compiling.
+       (emh-header-presentation-method): Use `mime-insert-header' instead
+       of `mime-insert-decoded-header'.
+
+\f
 1998-10-18  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
 
        * EMH: Version 1.9.0 was released.

diff --git a/Makefile b/Makefile
index 5547f8f..ba3f9b7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # Makefile for EMH
 #
 
-VERSION = 1.9.0
+VERSION = 1.10.1
 
 TAR    = tar
 RM     = /bin/rm -f
@@ -44,7 +44,7 @@ tar:
        sh -c 'cvs tag -RF emh-`echo $(VERSION) \
                                | sed s/\\\\./_/ | sed s/\\\\./_/`; \
        cd /tmp; \
-       cvs -d :pserver:anonymous@chamonix.jaist.ac.jp:/hare/cvs/root \
+       cvs -d :pserver:anonymous@cvs.m17n.org:/cvs/root \
                export -d emh-$(VERSION) \
                -r emh-`echo $(VERSION) \
                        | sed s/\\\\./_/ | sed s/\\\\./_/` emh'

diff --git a/README.en b/README.en
index 04dd283..85d336a 100644 (file)
--- a/README.en
+++ b/README.en
@@ -4,19 +4,19 @@ What's EMH?
 ===========
 
   EMH is a extender for mh-e to provide MIME feature using SEMI.  It
-  requires APEL (9.3 or later), FLIM (1.10.5 or later) and SEMI (1.9.1
-  or later) package.  Please install them before installing it.  APEL
-  package is available at:
+  requires APEL (9.5 or later), FLIM (1.11.1 or later) and SEMI
+  (1.10.0 or later) package.  Please install them before installing
+  it.  APEL package is available at:
 
-       ftp://ftp.jaist.ac.jp/pub/GNU/elisp/apel/
+       ftp://ftp.m17n.org/pub/mule/apel/
 
   FLIM package is available at:
 
-       ftp://ftp.jaist.ac.jp/pub/GNU/elisp/flim/
+       ftp://ftp.m17n.org/pub/mule/flim/
 
   SEMI package is available at:
 
-       ftp://ftp.jaist.ac.jp/pub/GNU/elisp/semi/
+       ftp://ftp.m17n.org/pub/mule/semi/
 
 
 Installation
@@ -85,20 +85,17 @@ Mailing lists
 =============
 
   If you write bug-reports and/or suggestions for improvement, please
-  send them to the tm Mailing List:
+  send them to the EMACS-MIME Mailing List:
 
-       bug-tm-en@chamonix.jaist.ac.jp  (English)
-       bug-tm-ja@chamonix.jaist.ac.jp  (Japanese)
+       emacs-mime-en@m17n.org  (English)
+       emacs-mime-ja@m17n.org  (Japanese)
 
-  Via the tm ML, you can report EMH bugs, obtain the latest release of
-  EMH, and discuss future enhancements to EMH.  To join the tm ML,
-  send e-mail to
+  Via the EMACS-MIME ML, you can report EMH bugs, obtain the latest
+  release of EMH, and discuss future enhancements to EMH.  To join the
+  EMACS-MIME ML, send an empty e-mail to
 
-       tm-ja-admin@chamonix.jaist.ac.jp        (Japanese)
-       tm-en-admin@chamonix.jaist.ac.jp        (English)
-
-  Since the user registration is done manually, please write the mail
-  body in human-recognizable language (^_^).
+       emacs-mime-en-ctl@m17n.org      (English)
+       emacs-mime-ja-ctl@m17n.org      (Japanese)
 
 
 CVS based development
@@ -106,7 +103,7 @@ CVS based development
 
   If you would like to join CVS based development, please send mail to
 
-       cvs@chamonix.jaist.ac.jp
+       cvs@cvs.m17n.org
 
   with your account name and UNIX style crypted password.  We hope you 
   will join the open development.

diff --git a/emh-comp.el b/emh-comp.el
index a326f1f..4c16c36 100644 (file)
--- a/emh-comp.el
+++ b/emh-comp.el
@@ -30,6 +30,14 @@
 (require 'mh-comp)
 (require 'mime-edit)
 
+;; Avoid byte compile warnings.
+;; (defvar gnus-article-buffer)
+;; (defvar gnus-article-copy)
+;; (defvar gnus-original-article-buffer)
+;; (eval-when-compile
+;;   (fset 'gnus-copy-article-buffer 'ignore)
+;;   )
+
 
 ;;; @ variable
 ;;;
@@ -40,7 +48,7 @@ Default is \"forwcomps\".  If not a complete path name, the file
 is searched for first in the user's MH directory, then in the
 system MH lib directory.")
 
-(defvar emh-message-yank-function 'mh-yank-cur-msg)
+;; (defvar emh-message-yank-function 'mh-yank-cur-msg)
 
 
 ;;; @ for tm-edit
@@ -480,37 +488,37 @@ yanked message will be deleted."
            (insert "\n"))))
     (error "There is no current message")))
 
-(defun emh-yank-current-message ()
-  "Insert the current message into the draft buffer.
-It uses variable `emh-message-yank-function'
-to select message yanking function."
-  (interactive)
-  (let ((mh-sent-from-folder mh-sent-from-folder)
-       (mh-sent-from-msg mh-sent-from-msg))
-    (if (and (not (stringp mh-sent-from-folder))
-            (boundp 'gnus-article-buffer)
-            (get-buffer gnus-article-buffer)
-            (bufferp mh-sent-from-folder)
-            ) ; might be called from GNUS
-       (if (boundp 'gnus-article-copy) ; might be sgnus
-           (save-excursion
-             (gnus-copy-article-buffer)
-             (setq mh-sent-from-folder gnus-article-copy)
-             (set-buffer mh-sent-from-folder)
-             (setq mh-show-buffer gnus-article-copy)
-             )
-         (save-excursion
-           (setq mh-sent-from-folder gnus-article-buffer)
-           (set-buffer gnus-article-buffer)
-           (setq mh-show-buffer (current-buffer))
-           )))
-    (funcall emh-message-yank-function)
-    ))
-
-(substitute-key-definition
- 'mh-yank-cur-msg 'emh-yank-current-message mh-letter-mode-map)
-(substitute-key-definition
- 'mh-insert-letter 'emh-insert-letter mh-letter-mode-map)
+;; (defun emh-yank-current-message ()
+;;   "Insert the current message into the draft buffer.
+;; It uses variable `emh-message-yank-function'
+;; to select message yanking function."
+;;   (interactive)
+;;   (let ((mh-sent-from-folder mh-sent-from-folder)
+;;         (mh-sent-from-msg mh-sent-from-msg))
+;;     (if (and (not (stringp mh-sent-from-folder))
+;;              (boundp 'gnus-article-buffer)
+;;              (get-buffer gnus-article-buffer)
+;;              (bufferp mh-sent-from-folder)
+;;              ) ; might be called from GNUS
+;;         (if (boundp 'gnus-article-copy) ; might be sgnus
+;;             (save-excursion
+;;               (gnus-copy-article-buffer)
+;;               (setq mh-sent-from-folder gnus-article-copy)
+;;               (set-buffer mh-sent-from-folder)
+;;               (setq mh-show-buffer gnus-article-copy)
+;;               )
+;;           (save-excursion
+;;             (setq mh-sent-from-folder gnus-article-buffer)
+;;             (set-buffer gnus-article-buffer)
+;;             (setq mh-show-buffer (current-buffer))
+;;             )))
+;;     (funcall emh-message-yank-function)
+;;     ))
+
+;; (substitute-key-definition
+;;  'mh-yank-cur-msg 'emh-yank-current-message mh-letter-mode-map)
+;; (substitute-key-definition
+;;  'mh-insert-letter 'emh-insert-letter mh-letter-mode-map)
 
 
 ;;; @ end

diff --git a/emh.el b/emh.el
index 7229b2e..af0ad17 100644 (file)
--- a/emh.el
+++ b/emh.el
@@ -32,13 +32,12 @@
 (require 'mh-e)
 (require 'alist)
 (require 'mime-view)
-(eval-when-compile (require 'mime-text))
 
 
 ;;; @ version
 ;;;
 
-(defconst emh-version "1.9.0")
+(defconst emh-version "1.10.0")
 
 
 ;;; @ variable
@@ -232,9 +231,9 @@ digest are inserted into the folder after that message."
 (autoload 'emh-highlight-header "emh-face")
 
 (defun emh-header-presentation-method (entity situation)
-  (mime-insert-decoded-header entity
-                             mime-view-ignored-field-list
-                             mime-view-visible-field-list)
+  (mime-insert-header entity
+                     mime-view-ignored-field-list
+                     mime-view-visible-field-list)
   (run-hooks 'emh-display-header-hook)
   )