X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-mime.el;h=19e2fc020edf8866110ea7f6c932ada8d6038dae;hb=3719a3d73eed04deaae46b08b752f94cce2ebaec;hp=9d0c4025cf44bc065ad31d0df62d4ebd303c4aae;hpb=c4e7ce1dade928921d2ef82110694e365ca55dc2;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-mime.el b/wl/wl-mime.el
index 9d0c402..19e2fc0 100644
--- a/wl/wl-mime.el
+++ b/wl/wl-mime.el
@@ -34,14 +34,6 @@
 (require 'mime-play)
 (require 'elmo)
 
-(eval-when-compile
-  (defalias-maybe 'Meadow-version 'ignore))
-
-(defvar xemacs-betaname)
-(defvar xemacs-codename)
-(defvar enable-multibyte-characters)
-(defvar mule-version)
-
 ;;; Draft
 
 (defalias 'wl-draft-editor-mode 'mime-edit-mode)
@@ -68,11 +60,9 @@ has Non-nil value\)"
 	  (set-buffer (wl-current-message-buffer))
 	  (save-restriction
 	    (widen)
-	      (if (or (and wl-on-xemacs
-			   zmacs-regions zmacs-region-active-p)
-		      (and transient-mark-mode mark-active))
-		  (wl-mime-preview-follow-current-region)
-		(mime-preview-follow-current-entity)))))))
+	    (if (wl-region-exists-p)
+		(wl-mime-preview-follow-current-region)
+	      (mime-preview-follow-current-entity)))))))
 
 ;; modified mime-preview-follow-current-entity from mime-view.el
 (defun wl-mime-preview-follow-current-region ()
@@ -280,7 +270,7 @@ It calls following-method selected from variable
 			  (wl-mime-node-id-to-string node-id))))
 	(with-temp-buffer
 	  (insert-buffer orig-buf)
-	  (kill-region header-start body-end)
+	  (delete-region header-start body-end)
 	  (goto-char header-start)
 	  (insert "Content-Type: text/plain; charset=US-ASCII\n\n")
 	  (insert "** This part has been removed by Wanderlust **\n\n")