Suppress byte-compiler warnings.

diff --git a/epa-file.el b/epa-file.el
index 9828b65..f3bbaee 100644 (file)
--- a/epa-file.el
+++ b/epa-file.el
@@ -84,13 +84,15 @@ May either be a string or a list of strings.")
 
 (defvar epa-file-passphrase-alist nil)
 
 
 (defvar epa-file-passphrase-alist nil)
 

-(if (fboundp 'encode-coding-string)
-    (defalias 'epa-file--encode-coding-string 'encode-coding-string)
-  (defalias 'epa-file--encode-coding-string 'identity))
+(eval-and-compile
+  (if (fboundp 'encode-coding-string)
+      (defalias 'epa-file--encode-coding-string 'encode-coding-string)
+    (defalias 'epa-file--encode-coding-string 'identity)))

 
 

-(if (fboundp 'decode-coding-string)
-    (defalias 'epa-file--decode-coding-string 'decode-coding-string)
-  (defalias 'epa-file--decode-coding-string 'identity))
+(eval-and-compile
+  (if (fboundp 'decode-coding-string)
+      (defalias 'epa-file--decode-coding-string 'decode-coding-string)
+    (defalias 'epa-file--decode-coding-string 'identity)))

 
 (defun epa-file-name-regexp-update ()
   (interactive)
 
 (defun epa-file-name-regexp-update ()
   (interactive)

@@ -270,7 +272,7 @@ If no one is selected, symmetric encryption will be performed.  "
   (make-local-variable 'epa-file-encrypt-to)
   (setq epa-file-encrypt-to
        (epa-select-keys
   (make-local-variable 'epa-file-encrypt-to)
   (setq epa-file-encrypt-to
        (epa-select-keys

-        context
+        (epg-make-context)

         "Select recipents for encryption.
 If no one is selected, symmetric encryption will be performed.  ")))
 
         "Select recipents for encryption.
 If no one is selected, symmetric encryption will be performed.  ")))
 

diff --git a/epa.el b/epa.el
index bc2938a..6a6b422 100644 (file)
--- a/epa.el
+++ b/epa.el
@@ -246,13 +246,15 @@ You should bind this variable with `let', but do not set it globally.")
          (epg-sub-key-id (car (epg-key-sub-key-list
                                (widget-get widget :value))))))
 
          (epg-sub-key-id (car (epg-key-sub-key-list
                                (widget-get widget :value))))))
 

-(if (fboundp 'encode-coding-string)
-    (defalias 'epa--encode-coding-string 'encode-coding-string)
-  (defalias 'epa--encode-coding-string 'identity))
+(eval-and-compile
+  (if (fboundp 'encode-coding-string)
+      (defalias 'epa--encode-coding-string 'encode-coding-string)
+    (defalias 'epa--encode-coding-string 'identity)))

 
 

-(if (fboundp 'decode-coding-string)
-    (defalias 'epa--decode-coding-string 'decode-coding-string)
-  (defalias 'epa--decode-coding-string 'identity))
+(eval-and-compile
+  (if (fboundp 'decode-coding-string)
+      (defalias 'epa--decode-coding-string 'decode-coding-string)
+    (defalias 'epa--decode-coding-string 'identity)))

 
 (defun epa-key-list-mode ()
   "Major mode for `epa-list-keys'."
 
 (defun epa-key-list-mode ()
   "Major mode for `epa-list-keys'."

@@ -877,10 +879,11 @@ Don't use this command in Lisp programs!"
            (error "No cleartext tail"))
          (epa-verify-region cleartext-start cleartext-end))))))
 
            (error "No cleartext tail"))
          (epa-verify-region cleartext-start cleartext-end))))))
 

-(if (fboundp 'select-safe-coding-system)
-    (defalias 'epa--select-safe-coding-system 'select-safe-coding-system)
-  (defun epa--select-safe-coding-system (from to)
-    buffer-file-coding-system))
+(eval-and-compile
+  (if (fboundp 'select-safe-coding-system)
+      (defalias 'epa--select-safe-coding-system 'select-safe-coding-system)
+    (defun epa--select-safe-coding-system (from to)
+      buffer-file-coding-system)))

 
 ;;;###autoload
 (defun epa-sign-region (start end signers mode)
 
 ;;;###autoload
 (defun epa-sign-region (start end signers mode)

@@ -938,15 +941,16 @@ If no one is selected, default secret key is used.  "
                                 'start-open t
                                 'end-open t)))))
 
                                 'start-open t
                                 'end-open t)))))
 

-(if (fboundp 'derived-mode-p)
-    (defalias 'epa--derived-mode-p 'derived-mode-p)
-  (defun epa--derived-mode-p (&rest modes)
-    "Non-nil if the current major mode is derived from one of MODES.
+(eval-and-compile
+  (if (fboundp 'derived-mode-p)
+      (defalias 'epa--derived-mode-p 'derived-mode-p)
+    (defun epa--derived-mode-p (&rest modes)
+      "Non-nil if the current major mode is derived from one of MODES.

 Uses the `derived-mode-parent' property of the symbol to trace backwards."
 Uses the `derived-mode-parent' property of the symbol to trace backwards."

-    (let ((parent major-mode))
-      (while (and (not (memq parent modes))
-                 (setq parent (get parent 'derived-mode-parent))))
-      parent)))
+      (let ((parent major-mode))
+       (while (and (not (memq parent modes))
+                   (setq parent (get parent 'derived-mode-parent))))
+       parent))))

 
 ;;;###autoload
 (defun epa-encrypt-region (start end recipients sign signers)
 
 ;;;###autoload
 (defun epa-encrypt-region (start end recipients sign signers)

diff --git a/epg.el b/epg.el
index 914da2b..160f911 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -1193,6 +1193,11 @@ This function is for internal use only."
           (file-exists-p (epg-context-output-file context)))
       (delete-file (epg-context-output-file context))))
 
           (file-exists-p (epg-context-output-file context)))
       (delete-file (epg-context-output-file context))))
 

+(eval-and-compile
+  (if (fboundp 'decode-coding-string)
+      (defalias 'epg--decode-coding-string 'decode-coding-string)
+    (defalias 'epg--decode-coding-string 'identity)))
+

 (defun epg--status-USERID_HINT (context string)
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (let* ((key-id (match-string 1 string))
 (defun epg--status-USERID_HINT (context string)
   (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
       (let* ((key-id (match-string 1 string))

@@ -1218,6 +1223,17 @@ This function is for internal use only."
 (defun epg--status-NEED_PASSPHRASE_PIN (context string)
   (setq epg-key-id 'PIN))
 
 (defun epg--status-NEED_PASSPHRASE_PIN (context string)
   (setq epg-key-id 'PIN))
 

+(eval-and-compile
+  (if (fboundp 'clear-string)
+      (defalias 'epg--clear-string 'clear-string)
+    (defun epg--clear-string (string)
+      (fillarray string 0))))
+
+(eval-and-compile
+  (if (fboundp 'encode-coding-string)
+      (defalias 'epg--encode-coding-string 'encode-coding-string)
+    (defalias 'epg--encode-coding-string 'identity)))
+

 (defun epg--status-GET_HIDDEN (context string)
   (when (and epg-key-id
             (string-match "\\`passphrase\\." string))
 (defun epg--status-GET_HIDDEN (context string)
   (when (and epg-key-id
             (string-match "\\`passphrase\\." string))

@@ -1816,72 +1832,60 @@ NAME is either a string or a list of strings."
       (setq pointer (cdr pointer)))
     keys))
 
       (setq pointer (cdr pointer)))
     keys))
 

-(if (fboundp 'make-temp-file)
-    (defalias 'epg--make-temp-file 'make-temp-file)
-  (defvar temporary-file-directory)
-  ;; stolen from poe.el.
-  (defun epg--make-temp-file (prefix)
-    "Create a temporary file.
+(eval-and-compile
+  (if (fboundp 'make-temp-file)
+      (defalias 'epg--make-temp-file 'make-temp-file)
+    (defvar temporary-file-directory)
+    ;; stolen from poe.el.
+    (defun epg--make-temp-file (prefix)
+      "Create a temporary file.

 The returned file name (created by appending some random characters at the end
 of PREFIX, and expanding against `temporary-file-directory' if necessary),
 is guaranteed to point to a newly created empty file.
 You can then use `write-region' to write new data into the file."
 The returned file name (created by appending some random characters at the end
 of PREFIX, and expanding against `temporary-file-directory' if necessary),
 is guaranteed to point to a newly created empty file.
 You can then use `write-region' to write new data into the file."

-    (let (tempdir tempfile)
-      (setq prefix (expand-file-name prefix
-                                    (if (featurep 'xemacs)
-                                        (temp-directory)
-                                      temporary-file-directory)))
-      (unwind-protect
-         (let (file)
-           ;; First, create a temporary directory.
-           (while (condition-case ()
-                      (progn
-                        (setq tempdir (make-temp-name
-                                       (concat
-                                        (file-name-directory prefix)
-                                        "DIR")))
-                        ;; return nil or signal an error.
-                        (make-directory tempdir))
-                    ;; let's try again.
-                    (file-already-exists t)))
-           (set-file-modes tempdir 448)
-           ;; Second, create a temporary file in the tempdir.
-           ;; There *is* a race condition between `make-temp-name'
-           ;; and `write-region', but we don't care it since we are
-           ;; in a private directory now.
-           (setq tempfile (make-temp-name (concat tempdir "/EMU")))
-           (write-region "" nil tempfile nil 'silent)
-           (set-file-modes tempfile 384)
-           ;; Finally, make a hard-link from the tempfile.
-           (while (condition-case ()
-                      (progn
-                        (setq file (make-temp-name prefix))
-                        ;; return nil or signal an error.
-                        (add-name-to-file tempfile file))
-                    ;; let's try again.
-                    (file-already-exists t)))
-           file)
-       ;; Cleanup the tempfile.
-       (and tempfile
-            (file-exists-p tempfile)
-            (delete-file tempfile))
-       ;; Cleanup the tempdir.
-       (and tempdir
-            (file-directory-p tempdir)
-            (delete-directory tempdir))))))
-
-(if (fboundp 'clear-string)
-    (defalias 'epg--clear-string 'clear-string)
-  (defun epg--clear-string (string)
-    (fillarray string 0)))
-
-(if (fboundp 'encode-coding-string)
-    (defalias 'epg--encode-coding-string 'encode-coding-string)
-  (defalias 'epg--encode-coding-string 'identity))
-
-(if (fboundp 'decode-coding-string)
-    (defalias 'epg--decode-coding-string 'decode-coding-string)
-  (defalias 'epg--decode-coding-string 'identity))
+      (let (tempdir tempfile)
+       (setq prefix (expand-file-name prefix
+                                      (if (featurep 'xemacs)
+                                          (temp-directory)
+                                        temporary-file-directory)))
+       (unwind-protect
+           (let (file)
+             ;; First, create a temporary directory.
+             (while (condition-case ()
+                        (progn
+                          (setq tempdir (make-temp-name
+                                         (concat
+                                          (file-name-directory prefix)
+                                          "DIR")))
+                          ;; return nil or signal an error.
+                          (make-directory tempdir))
+                      ;; let's try again.
+                      (file-already-exists t)))
+             (set-file-modes tempdir 448)
+             ;; Second, create a temporary file in the tempdir.
+             ;; There *is* a race condition between `make-temp-name'
+             ;; and `write-region', but we don't care it since we are
+             ;; in a private directory now.
+             (setq tempfile (make-temp-name (concat tempdir "/EMU")))
+             (write-region "" nil tempfile nil 'silent)
+             (set-file-modes tempfile 384)
+             ;; Finally, make a hard-link from the tempfile.
+             (while (condition-case ()
+                        (progn
+                          (setq file (make-temp-name prefix))
+                          ;; return nil or signal an error.
+                          (add-name-to-file tempfile file))
+                      ;; let's try again.
+                      (file-already-exists t)))
+             file)
+         ;; Cleanup the tempfile.
+         (and tempfile
+              (file-exists-p tempfile)
+              (delete-file tempfile))
+         ;; Cleanup the tempdir.
+         (and tempdir
+              (file-directory-p tempdir)
+              (delete-directory tempdir)))))))

 
 (defun epg--args-from-sig-notations (notations)
   (apply #'nconc
 
 (defun epg--args-from-sig-notations (notations)
   (apply #'nconc