X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mh-e%2Ftm-mh-e.el;h=f72af2d81cdc77c84efae98b42edd6c63f8a4b5e;hb=2b47099f9bfa62e367a563f0009cac66938c7d66;hp=87d73cc15e92b53b298a5a2db78b084c0632fd26;hpb=424f06342096f9fcf57986cb6985c010911a4320;p=elisp%2Ftm.git

diff --git a/mh-e/tm-mh-e.el b/mh-e/tm-mh-e.el
index 87d73cc..f72af2d 100644
--- a/mh-e/tm-mh-e.el
+++ b/mh-e/tm-mh-e.el
@@ -8,9 +8,9 @@
 
 ;;; @ require modules
 ;;;
+
 (require 'tl-str)
 (require 'tl-misc)
-(require 'tm-misc)
 (require 'mh-e)
 (if (not (boundp 'mh-e-version))
     (require 'tm-mh-e3)
@@ -20,14 +20,16 @@
 
 ;;; @ version
 ;;;
+
 (defconst tm-mh-e/RCS-ID
-  "$Id: tm-mh-e.el,v 6.21 1995/06/22 12:02:13 morioka Exp $")
+  "$Id: tm-mh-e.el,v 6.24 1995/09/02 06:02:20 morioka Exp $")
 
 (defconst tm-mh-e/version (get-version-string tm-mh-e/RCS-ID))
 
 
 ;;; @ variable
 ;;;
+
 (defvar tm-mh-e/decode-all t
   "*If t, decode all of the message. Otherwise decode header only.")
 
@@ -166,7 +168,7 @@ With arg, turn MIME processing on if arg is positive."
 	   (save-window-excursion
 	     (switch-to-buffer (concat "show-" mh-sent-from-folder))
 	     mime::article/preview-buffer))
-	  (if (looking-at "^\\[.+\\]\n")
+	  (if (looking-at "^\\[.+\\(\n[ \t].+\\)*\\]\n")
 	      (replace-match ""))
 	  (narrow-to-region (point)(point-max))
 	  (mh-insert-prefix-string mh-ins-buf-prefix)
@@ -219,6 +221,7 @@ With arg, turn MIME processing on if arg is positive."
 
 ;;; @ for tm-comp
 ;;;
+
 (defun tm-mh-e::make-message (folder number)
   (vector folder number)
   )
@@ -305,12 +308,18 @@ With arg, turn MIME processing on if arg is positive."
 (defun tm-mh-e/summary-before-quit ()
   (let ((buf (get-buffer mh-show-buffer)))
     (if buf
-	(save-window-excursion
+	(let ((the-buf (current-buffer)))
 	  (switch-to-buffer buf)
-	  (if mime::article/preview-buffer
-	      (if (setq buf (get-buffer mime::article/preview-buffer))
-		  (kill-buffer buf)
-		))))))
+	  (if (and mime::article/preview-buffer
+		   (setq buf (get-buffer mime::article/preview-buffer))
+		   )
+	      (progn
+		(switch-to-buffer the-buf)
+		(kill-buffer buf)
+		)
+	    (switch-to-buffer the-buf)
+	    )
+	  ))))
 
 (add-hook 'mh-before-quit-hook (function tm-mh-e/summary-before-quit))
 	     
@@ -326,6 +335,10 @@ With arg, turn MIME processing on if arg is positive."
 	   'mh-show-mode
 	   (function tm-mh-e/code-convert-region-to-emacs))
 
-(run-hooks 'tm-mh-e-load-hook)
+
+;;; @ end
+;;;
 
 (provide 'tm-mh-e)
+
+(run-hooks 'tm-mh-e-load-hook)