2002-09-29 Simon Josefsson <jas@extundo.com>

	* pgg-parse.el (pgg-char-int, pgg-string-as-unibyte): Prevent byte
	compile warnings.

	* pgg.el (pgg-decrypt-region): Don't parse packet.

diff --git a/pgg/ChangeLog b/pgg/ChangeLog
index 873c46c..17674e5 100644 (file)
--- a/pgg/ChangeLog
+++ b/pgg/ChangeLog
@@ -1,5 +1,10 @@
 2002-09-29  Simon Josefsson  <jas@extundo.com>
 
+       * pgg-parse.el (pgg-char-int, pgg-string-as-unibyte): Prevent byte
+       compile warnings.
+
+       * pgg.el (pgg-decrypt-region): Don't parse packet.
+
        * luna.el: Removed.
 
        * pgg.el, pgg-gpg.el, pgg-pgp5.el: Don't depend on luna.el.

diff --git a/pgg/pgg-parse.el b/pgg/pgg-parse.el
index 191c11c..31fec95 100644 (file)
--- a/pgg/pgg-parse.el
+++ b/pgg/pgg-parse.el
@@ -99,9 +99,10 @@
     "^-----BEGIN PGP SIGNATURE-----\r?$")
   "Armor headers.")
 
-(defalias 'pgg-char-int (if (fboundp 'char-int)
-                           'char-int
-                         'identity))
+(eval-and-compile
+  (defalias 'pgg-char-int (if (fboundp 'char-int)
+                             'char-int
+                           'identity)))
 
 (defmacro pgg-format-key-identifier (string)
   `(mapconcat (lambda (c) (format "%02X" (pgg-char-int c)))
@@ -493,9 +494,10 @@
     (insert string)
     (pgg-decode-armor-region (point-min)(point))))
 
-(defalias 'pgg-string-as-unibyte (if (fboundp 'string-as-unibyte)
-                                    'string-as-unibyte
-                                  'identity))
+(eval-and-compile
+  (defalias 'pgg-string-as-unibyte (if (fboundp 'string-as-unibyte)
+                                      'string-as-unibyte
+                                    'identity)))
 
 (defun pgg-parse-armor-region (start end)
   (pgg-parse-armor (pgg-string-as-unibyte (buffer-substring start end))))

diff --git a/pgg/pgg.el b/pgg/pgg.el
index 955f178..536da3b 100644 (file)
--- a/pgg/pgg.el
+++ b/pgg/pgg.el
@@ -170,11 +170,10 @@
 (defun pgg-decrypt-region (start end)
   "Decrypt the current region between START and END."
   (interactive "r")
-  (let* ((packet (cdr (assq 1 (pgg-parse-armor-region start end))))
-        (status
-         (pgg-save-coding-system start end
-           (pgg-invoke "decrypt-region" (or pgg-scheme pgg-default-scheme)
-                       (point-min) (point-max)))))
+  (let ((status
+        (pgg-save-coding-system start end
+          (pgg-invoke "decrypt-region" (or pgg-scheme pgg-default-scheme)
+                      (point-min) (point-max)))))
     (when (interactive-p)
       (pgg-display-output-buffer start end status))
     status))