X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=pgg-gpg.el;h=886a6dcf34dea28c2ce19e615d94453fb26cbb7e;hb=e579dc5ecdc454299ed8fadb558953b8efd2bc00;hp=1b24cdde7464286c9f192b9fe312cbd778c6c0b3;hpb=e462efc3af1522d39aed42eb0bbbdb50bd4c303f;p=elisp%2Fsemi.git

diff --git a/pgg-gpg.el b/pgg-gpg.el
index 1b24cdd..886a6dc 100644
--- a/pgg-gpg.el
+++ b/pgg-gpg.el
@@ -79,7 +79,8 @@
 	 process status exit-status)
     (when pgg-gpg-messages-locale
       (setq process-environment (copy-sequence process-environment))
-      (setenv "LC_ALL" pgg-gpg-messages-locale))
+      (setenv "LC_ALL" pgg-gpg-messages-locale)
+      (setenv "LANGUAGE" pgg-gpg-messages-locale))
     (with-current-buffer (get-buffer-create errors-buffer)
       (buffer-disable-undo)
       (erase-buffer))
@@ -207,7 +208,12 @@
       (goto-char (point-min))
       (prog1 (re-search-forward "^\\[GNUPG:] GOODSIG\\>" nil t)
 	(goto-char (point-min))
-	(delete-matching-lines "^\\[GNUPG:] ")))))
+	(delete-matching-lines "^\\[GNUPG:] ")
+	;; XXX: copy contents of pgg-errors-buffer into
+	;; pgg-output-buffer for backward compatibility.
+	(with-current-buffer pgg-output-buffer
+	  (set-buffer-multibyte t)
+	  (insert-buffer-substring pgg-errors-buffer))))))
 
 (luna-define-method pgg-scheme-insert-key ((scheme pgg-scheme-gpg))
   (let* ((pgg-gpg-user-id (or pgg-gpg-user-id pgg-default-user-id))
@@ -238,7 +244,11 @@
 	      (if (zerop (aref status 9))
 		  ""
 		"\tSecret keys are imported.\n"))
-      (append-to-buffer pgg-errors-buffer (point-min)(point-max))
+      ;; XXX: copy contents of pgg-errors-buffer into
+      ;; pgg-output-buffer for backward compatibility.
+      (with-current-buffer pgg-output-buffer
+	(set-buffer-multibyte t)
+	(insert-buffer-substring pgg-errors-buffer))
       t)))
 
 (provide 'pgg-gpg)