From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 14 Jan 2014 08:41:09 +0000 (+0900)
Subject: * epa-file.el: Respect buffer-file-format when writing
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~382
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=02bf443d2ea21189dc0e8ac0bb741db9fa8fc365;p=emacs.git

* epa-file.el: Respect buffer-file-format when writing

* epa-file.el (epa-file-write-region): Encode the region according
to `buffer-file-format'.  Problem reported at:
<http://sourceforge.jp/ticket/browse.php?group_id=2267&tid=32917>.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e45b0ba0574..243078ebad4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2014-01-14  Daiki Ueno  <ueno@gnu.org>
+
+	* epa-file.el (epa-file-write-region): Encode the region according
+	to `buffer-file-format'.  Problem reported at:
+	<http://sourceforge.jp/ticket/browse.php?group_id=2267&tid=32917>.
+
 2014-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/edebug.el (edebug--display): Move protective let-binding
diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index eea458d200d..20d34f82223 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -211,7 +211,8 @@ encryption is used."
 	 (recipients
 	  (cond
 	   ((listp epa-file-encrypt-to) epa-file-encrypt-to)
-	   ((stringp epa-file-encrypt-to) (list epa-file-encrypt-to)))))
+	   ((stringp epa-file-encrypt-to) (list epa-file-encrypt-to))))
+	 buffer)
     (epg-context-set-passphrase-callback
      context
      (cons #'epa-file-passphrase-callback-function
@@ -230,8 +231,18 @@ encryption is used."
 		 (unless start
 		   (setq start (point-min)
 			 end (point-max)))
-		 (epa-file--encode-coding-string (buffer-substring start end)
-						 coding-system))
+		 (setq buffer (current-buffer))
+		 (with-temp-buffer
+		   (insert-buffer-substring buffer start end)
+		   ;; Translate the region according to
+		   ;; `buffer-file-format', as `write-region' would.
+		   ;; We can't simply do `write-region' (into a
+		   ;; temporary file) here, since it writes out
+		   ;; decrypted contents.
+		   (format-encode-buffer (with-current-buffer buffer
+					   buffer-file-format))
+		   (epa-file--encode-coding-string (buffer-string)
+						   coding-system)))
 	       (if (or (eq epa-file-select-keys t)
 		       (and (null epa-file-select-keys)
 			    (not (local-variable-p 'epa-file-encrypt-to