From 513481757377c7ade9f47b21d084fdff47a8a057 Mon Sep 17 00:00:00 2001 From: ueno Date: Wed, 17 Dec 2003 06:34:12 +0000 Subject: [PATCH] * pgg-gpg.el (pgg-scheme-verify-region): Copy contents of pgg-errors-buffer into pgg-output-buffer for backward compatibility. (pgg-scheme-snarf-keys-region): Ditto. --- ChangeLog | 3 --- pgg-gpg.el | 13 +++++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4e5f1f0..3d4e837 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,9 +3,6 @@ * pgg-gpg.el (pgg-gpg-messages-locale): New user option. (pgg-gpg-process-region): Set environment variable LC_ALL when pgg-gpg-messages-locale is specified. - (pgg-scheme-verify-region): Don't copy messages from - pgg-errors-buffer to pgg-output-buffer. - (pgg-scheme-snarf-keys-region): Ditto. * pgg-def.el (pgg-messages-locale): New user option. diff --git a/pgg-gpg.el b/pgg-gpg.el index 1b24cdd..957ea61 100644 --- a/pgg-gpg.el +++ b/pgg-gpg.el @@ -207,7 +207,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 +243,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) -- 1.7.10.4