;; Copyright (C) 1995,1996,1997,1998,1999 MORIOKA Tomohiko
;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
+;; Daiki Ueno <ueno@ueda.info.waseda.ac.jp>
;; Created: 1995/12/7
;; Renamed: 1997/2/27 from tm-pgp.el
;; Keywords: PGP, security, MIME, multimedia, mail, news
(orig-entity (nth onum (mime-entity-children mother)))
(basename (expand-file-name "tm" temporary-file-directory))
(sig-file (concat (make-temp-name basename) ".asc"))
- )
- (save-excursion (mime-show-echo-buffer))
+ status)
+ (save-excursion
+ (mime-show-echo-buffer)
+ (set-buffer mime-echo-buffer-name)
+ (set-window-start
+ (get-buffer-window mime-echo-buffer-name)
+ (point-max))
+ )
(mime-write-entity-content entity sig-file)
(unwind-protect
(with-temp-buffer
(while (progn (end-of-line) (not (eobp)))
(insert "\r")
(forward-line 1))
- (let ((pgg-output-buffer mime-echo-buffer-name))
- (pgg-verify-region (point-min)(point-max) sig-file 'fetch)))
+ (setq status (pgg-verify-region (point-min)(point-max)
+ sig-file 'fetch))
+ (save-excursion
+ (set-buffer mime-echo-buffer-name)
+ (insert-buffer-substring (if status pgg-output-buffer
+ pgg-errors-buffer))))
(delete-file sig-file))
))
;;; draft-yamamoto-openpgp-mime-00.txt (OpenPGP/MIME).
(defun mime-add-application/pgp-keys (entity situation)
- (save-excursion (mime-show-echo-buffer))
+ (save-excursion
+ (mime-show-echo-buffer)
+ (set-buffer mime-echo-buffer-name)
+ (set-window-start
+ (get-buffer-window mime-echo-buffer-name)
+ (point-max))
+ )
(with-temp-buffer
(mime-insert-entity-content entity)
(mime-decode-region (point-min) (point-max)
(cdr (assq 'encoding situation)))
- (let ((pgg-output-buffer mime-echo-buffer-name))
- (pgg-snarf-keys-region (point-min)(point-max)))))
+ (let ((status (pgg-snarf-keys-region (point-min)(point-max))))
+ (save-excursion
+ (set-buffer mime-echo-buffer-name)
+ (insert-buffer-substring (if status pgg-output-buffer
+ pgg-errors-buffer)))
+ )))
;;; @ end