(gnus-string-equal): Revert last change.

[gnus] / lisp / pgg.el

diff --git a/lisp/pgg.el b/lisp/pgg.el
index 40d2140..8fffe88 100644 (file)
--- a/lisp/pgg.el
+++ b/lisp/pgg.el
@@ -33,10 +33,16 @@
 (require 'pgg-parse)
 
 (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
 ;;;
 
@@ -136,19 +142,6 @@
   `(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
 ;;;
 
@@ -187,7 +180,7 @@ the region."
   (interactive "r")
   (let* ((buf (current-buffer))
         (packet (cdr (assq 1 (with-temp-buffer
-                               (insert-buffer buf)
+                               (insert-buffer-substring buf)
                                (pgg-decode-armor-region
                                 (point-min) (point-max))))))
         (key (cdr (assq 'key-identifier packet)))