From: ueno <ueno>
Date: Mon, 19 Feb 2007 03:53:29 +0000 (+0000)
Subject: * mime-edit.el (mime-edit-sign-pgp-mime): Create a signature for
X-Git-Tag: emiko-1_14_1-epg-0_0_11
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cd538ee87cf86f47356ec51db1b95068058c9673;p=elisp%2Fsemi.git

* mime-edit.el (mime-edit-sign-pgp-mime): Create a signature for
binary document.
---

diff --git a/ChangeLog b/ChangeLog
index 70c1e21..6f159dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-19  Daiki Ueno  <ueno@unixuser.org>
+
+	* mime-edit.el (mime-edit-sign-pgp-mime): Create a signature for
+	binary document.
+
 2006-12-02  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* mime-edit.el (mime-edit-process-multipart-1): Don't insert a
diff --git a/mime-edit.el b/mime-edit.el
index ccea2e8..87d0e30 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1686,7 +1686,8 @@ Parameter must be '(PROMPT CHOICE1 (CHOICE2...))."
 	     (encoding (nth 1 ret))
 	     (pgp-boundary (concat "pgp-sign-" boundary))
 	     (context (epg-make-context))
-	     signature micalg)
+	     (index 0)
+	     plain signature micalg)
 	(mime-edit-delete-trailing-whitespace) ; RFC3156
 	(goto-char beg)
 	(insert (format "Content-Type: %s\n" ctype))
@@ -1694,7 +1695,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOICE2...))."
 	    (insert (format "Content-Transfer-Encoding: %s\n" encoding)))
 	(insert "\n")
 	(epg-context-set-armor context t)
-	(epg-context-set-textmode context t)
+	(epg-context-set-textmode context nil)
 	(if mime-edit-pgp-verbose
 	    (epg-context-set-signers
 	     context
@@ -1713,11 +1714,15 @@ If no one is selected, default secret key is used.  "
 	       (mapcar (lambda (name)
 			 (car (epg-list-keys context name t)))
 		       mime-edit-pgp-signers))))
+	(setq plain (buffer-substring (point-min) (point-max)))
+	(while (string-match "\r?\n" plain index)
+	  (if (eq (aref plain (match-beginning 0)) ?\r)
+	      (setq index (match-end 0))
+	    (setq plain (replace-match "\r\n" t t plain)
+		  index (1+ (match-end 0)))))
 	(condition-case error
 	    (setq signature
-		  (epg-sign-string context
-				   (buffer-substring (point-min) (point-max))
-				   'detached))
+		  (epg-sign-string context plain 'detached))
 	  (error (signal 'mime-edit-error (cdr error))))
 	(setq micalg (epg-new-signature-digest-algorithm
 		      (car (epg-context-result-for context 'sign))))