From: tomo <tomo>
Date: Wed, 20 Dec 2000 09:55:45 +0000 (+0000)
Subject: Sync with emh-1_14_0.
X-Git-Tag: semi21-1_14_0-1~3
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c6ba20c860cbb644fdd63157e50f75145fbad86;p=elisp%2Flemi.git

Sync with emh-1_14_0.
---

diff --git a/mime/emh-comp.el b/mime/emh-comp.el
index c50233c..dcbe6c6 100644
--- a/mime/emh-comp.el
+++ b/mime/emh-comp.el
@@ -350,12 +350,9 @@ then prompt for the message sequence. See also documentation for
 			 (set-buffer-modified-p nil)))
 		      (t
 		       (mh-read-draft "" draft-name nil)))))
-    (let ((msubtype "digest")
-	  orig-from orig-subject multipart-flag
-	  (tag-regexp
-	   (concat "^"
-		   (regexp-quote (mime-make-tag "message" "rfc822"))))
-	  )
+    (let ((tag-regexp
+	   (concat "^" (regexp-quote (mime-make-tag "message" "rfc822"))))
+	  orig-from orig-subject multipart-flag)
       (goto-char (point-min))
       (save-excursion
 	(save-restriction
diff --git a/mime/emh-face.el b/mime/emh-face.el
index 17fc9a6..f37af61 100644
--- a/mime/emh-face.el
+++ b/mime/emh-face.el
@@ -1,6 +1,6 @@
 ;;; emh-face.el --- header highlighting in emh.
 
-;; Copyright (C) 1997,2000 MORIOKA Tomohiko
+;; Copyright (C) 1997,2000 Free Software Foundation, Inc.
 
 ;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Created: 1997/3/4
@@ -29,7 +29,7 @@
 (require 'std11)
 
 (defsubst emh-set-face-foreground (face color)
-  (condition-case err
+  (condition-case nil
       (set-face-foreground face color)
     (error (message "Color `%s' is not found." color))))
 
diff --git a/mime/emh.el b/mime/emh.el
index 084ffa2..efa3f27 100644
--- a/mime/emh.el
+++ b/mime/emh.el
@@ -2,9 +2,9 @@
 
 ;; Copyright (C) 1995,1996,1997,1998,2000 Free Software Foundation, Inc.
 
-;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Author: MORIOKA Tomohiko <tomo@m17n.org>
 ;;         OKABE Yasuo <okabe@kudpc.kyoto-u.ac.jp>
-;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Maintainer: MORIOKA Tomohiko <tomo@m17n.org>
 ;; Created: 1993/11/21
 ;;	Renamed: 1993/11/27 from mh-e-mime.el
 ;;	Renamed: 1997/02/21 from tm-mh-e.el
@@ -37,7 +37,7 @@
 ;;; @ version
 ;;;
 
-(defconst emh-version "1.13.0")
+(defconst emh-version "1.14.0")
 
 
 ;;; @ variable