From: ueno <ueno>
Date: Mon, 18 Jun 2007 03:44:17 +0000 (+0000)
Subject: Sync with semi-1_14.
X-Git-Tag: emiko-1_14-epg-branchpoint
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Femiko-1_14;p=elisp%2Fsemi.git

Sync with semi-1_14.
---

diff --git a/ChangeLog b/ChangeLog
index 71e33b0..b52b17b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-18  Daiki Ueno  <ueno@unixuser.org>
+
+	* mime-edit.el (turn-on-mime-edit): Remove redundant comments and
+	newlines to make the amount of diff-lines minimal to the original.
+
 2007-06-08  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mime-edit.el (turn-on-mime-edit): Don't use the default values
diff --git a/mime-edit.el b/mime-edit.el
index 2a189d4..cbfc81f 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1005,12 +1005,14 @@ User customizable variables (not documented all of them):
     (if (featurep 'xemacs)
 	(mime-edit-define-menu-for-xemacs))
 
-    ;; 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))
+    (make-local-variable 'paragraph-start)
+    (setq paragraph-start
+	  (regexp-or mime-edit-single-part-tag-regexp
+		     paragraph-start))
+    (make-local-variable 'paragraph-separate)
+    (setq paragraph-separate
+	  (regexp-or mime-edit-single-part-tag-regexp
+		     paragraph-separate))
     (run-hooks 'mime-edit-mode-hook)
     (message
      "%s"