merge from semi-1_14 branch:

2007-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>

	* mime-edit.el (turn-on-mime-edit): Don't use the default values
	of paragraph-start and paragraph-separate.  Suggested by Ron
	Isaacson <Ron.Isaacson@morganstanley.com>.  cf.
	http://article.gmane.org/gmane.mail.wanderlust.general.japanese/5721

2007-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>

	* mime-edit.el (turn-on-mime-edit): Make paragraph-start and
	paragraph-separate buffer-local.

diff --git a/ChangeLog b/ChangeLog
index 7e27bb8..71e33b0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2007-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mime-edit.el (turn-on-mime-edit): Don't use the default values
+       of paragraph-start and paragraph-separate.  Suggested by Ron
+       Isaacson <Ron.Isaacson@morganstanley.com>.  cf.
+       http://article.gmane.org/gmane.mail.wanderlust.general.japanese/5721
+
+2007-04-24  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * mime-edit.el (turn-on-mime-edit): Make paragraph-start and
+       paragraph-separate buffer-local.
+
 2006-12-20  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
        * README.en (Required environment): Update required version of

diff --git a/mime-edit.el b/mime-edit.el
index 59220ca..2a189d4 100644 (file)
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1005,13 +1005,12 @@ User customizable variables (not documented all of them):
     (if (featurep 'xemacs)
        (mime-edit-define-menu-for-xemacs))
 
-    ;; I don't care about saving these.
-    (setq paragraph-start
-         (regexp-or mime-edit-single-part-tag-regexp
-                    paragraph-start))
-    (setq paragraph-separate
-         (regexp-or mime-edit-single-part-tag-regexp
-                    paragraph-separate))
+    ;; Make `paragraph-start' and `paragraph-separate' buffer-local
+    ;; and have a value to recognize part tags.
+    (set (make-local-variable 'paragraph-start)
+        (regexp-or mime-edit-single-part-tag-regexp paragraph-start))
+    (set (make-local-variable 'paragraph-separate)
+        (regexp-or mime-edit-single-part-tag-regexp paragraph-separate))
     (run-hooks 'mime-edit-mode-hook)
     (message
      "%s"