* nnmail.el (nnmail-cache-insert): make sure that the

[gnus] / lisp / pgg.el

diff --git a/lisp/pgg.el b/lisp/pgg.el
index f7b46ff..0481898 100644 (file)
--- a/lisp/pgg.el
+++ b/lisp/pgg.el
@@ -29,18 +29,19 @@
 
 (require 'pgg-def)
 (require 'pgg-parse)
+(autoload 'run-at-time "timer")
 
+;; Don't merge these two `eval-when-compile's.
+(eval-when-compile
+  (require 'cl))
+;; Fixme: This would be better done with an autoload for
+;; `url-insert-file-contents', and the url stuff rationalized.
+;; (`locate-library' can say whether the url code is available.)
 (eval-when-compile
-  (require 'cl)
   (ignore-errors
     (require 'w3)
     (require 'url)))
 
-(defvar pgg-temporary-file-directory
-  (cond ((fboundp 'temp-directory) (temp-directory))
-       ((boundp 'temporary-file-directory) temporary-file-directory)
-       ("/tmp/")))
-
 ;;; @ utility functions
 ;;;
 
@@ -70,7 +71,8 @@
        ,@body)))
 
 (defun pgg-temp-buffer-show-function (buffer)
-  (let ((window (split-window-vertically)))
+  (let ((window (or (get-buffer-window buffer 'visible)
+                   (split-window-vertically))))
     (set-window-buffer window buffer)
     (shrink-window-if-larger-than-buffer window)))
 
@@ -140,6 +142,19 @@
   `(with-current-buffer pgg-output-buffer
      (if (zerop (buffer-size)) nil ,@body t)))
 
+(defalias 'pgg-make-temp-file
+  (if (fboundp 'make-temp-file)
+      'make-temp-file
+    (lambda (prefix &optional dir-flag)
+      (let ((file (expand-file-name
+                  (make-temp-name prefix)
+                  (if (fboundp 'temp-directory)
+                      (temp-directory)
+                    temporary-file-directory))))
+       (if dir-flag
+           (make-directory file))
+       file))))
+
 ;;; @ interface functions
 ;;;
 
@@ -177,15 +192,6 @@ the region."
   "Decrypt the current region between START and END."
   (interactive "r")
   (let* ((buf (current-buffer))
-        (packet (cdr (assq 1 (with-temp-buffer
-                               (insert-buffer-substring buf)
-                               (pgg-decode-armor-region
-                                (point-min) (point-max))))))
-        (key (cdr (assq 'key-identifier packet)))
-        (pgg-default-user-id 
-         (if key
-             (concat "0x" (pgg-truncate-key-identifier key))
-           pgg-default-user-id))
         (status
          (pgg-save-coding-system start end
            (pgg-invoke "decrypt-region" (or pgg-scheme pgg-default-scheme)