(epg-make-context): Add autoload cookie.

(epg-list-keys, epg-cancel, epg-start-decrypt, epg-decrypt-file)
(epg-decrypt-string, epg-start-verify, epg-verify-file)
(epg-verify-string, epg-start-sign, epg-sign-file)
(epg-sign-string, epg-start-encrypt, epg-encrypt-file)
(epg-encrypt-string, epg-start-export-keys)
(epg-export-keys-to-file, epg-export-keys-to-string)
(epg-start-import-keys, epg-import-keys-from-file)
(epg-import-keys-from-string, epg-start-receive-keys)
(epg-receive-keys, epg-import-keys-from-server)
(epg-start-delete-keys, epg-delete-keys, epg-start-sign-keys)
(epg-sign-keys, epg-start-generate-key)
(epg-generate-key-from-file, epg-generate-key-from-string): Remove
autoload cookie.

2 files changed, 18 insertions, 30 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 14fee5ba12c..9a0cc52e5ac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,20 @@
+2009-09-12  Daiki Ueno  <ueno@unixuser.org>
+
+        * epg.el (epg-make-context): Add autoload cookie.
+        (epg-list-keys, epg-cancel, epg-start-decrypt, epg-decrypt-file)
+        (epg-decrypt-string, epg-start-verify, epg-verify-file)
+        (epg-verify-string, epg-start-sign, epg-sign-file)
+        (epg-sign-string, epg-start-encrypt, epg-encrypt-file)
+        (epg-encrypt-string, epg-start-export-keys)
+        (epg-export-keys-to-file, epg-export-keys-to-string)
+        (epg-start-import-keys, epg-import-keys-from-file)
+        (epg-import-keys-from-string, epg-start-receive-keys)
+        (epg-receive-keys, epg-import-keys-from-server)
+        (epg-start-delete-keys, epg-delete-keys, epg-start-sign-keys)
+        (epg-sign-keys, epg-start-generate-key)
+        (epg-generate-key-from-file, epg-generate-key-from-string): Remove
+        autoload cookie.
+
 2009-09-12  Eli Zaretskii  <eliz@gnu.org>
 
         * dos-fns.el (dos-reevaluate-defcustoms): Comment out the
diff --git a/lisp/epg.el b/lisp/epg.el
index 64489858a6d..d80e966c942 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -181,6 +181,7 @@
     (signal 'wrong-type-argument (list 'epg-data-p data)))
   (aref (cdr data) 1))
 
+;;;###autoload
 (defun epg-make-context (&optional protocol armor textmode include-certs
                                    cipher-algorithm digest-algorithm
                                    compress-algorithm)
@@ -1755,7 +1756,6 @@ This function is for internal use only."
    (if (aref line 6)
        (epg--time-from-seconds (aref line 6)))))
 
-;;;###autoload
 (defun epg-list-keys (context &optional name mode)
   "Return a list of epg-key objects matched with NAME.
 If MODE is nil or 'public, only public keyring should be searched.
@@ -1922,7 +1922,6 @@ You can then use `write-region' to write new data into the file."
                       (epg-sig-notation-value notation)))))
           notations)))
 
-;;;###autoload
 (defun epg-cancel (context)
   (if (buffer-live-p (process-buffer (epg-context-process context)))
       (save-excursion
@@ -1934,7 +1933,6 @@ You can then use `write-region' to write new data into the file."
   (if (eq (process-status (epg-context-process context)) 'run)
       (delete-process (epg-context-process context))))
 
-;;;###autoload
 (defun epg-start-decrypt (context cipher)
   "Initiate a decrypt operation on CIPHER.
 CIPHER must be a file data object.
@@ -1966,7 +1964,6 @@ If you are unsure, use synchronous version of this function
             (signal 'epg-error (list "No data")))
         (signal 'epg-error (list "Can't decrypt" error)))))
 
-;;;###autoload
 (defun epg-decrypt-file (context cipher plain)
   "Decrypt a file CIPHER and store the result to a file PLAIN.
 If PLAIN is nil, it returns the result as a string."
@@ -1985,7 +1982,6 @@ If PLAIN is nil, it returns the result as a string."
       (epg-delete-output-file context))
     (epg-reset context)))
 
-;;;###autoload
 (defun epg-decrypt-string (context cipher)
   "Decrypt a string CIPHER and return the plain text."
   (let ((input-file (epg--make-temp-file "epg-input"))
@@ -2004,7 +2000,6 @@ If PLAIN is nil, it returns the result as a string."
           (delete-file input-file))
       (epg-reset context))))
 
-;;;###autoload
 (defun epg-start-verify (context signature &optional signed-text)
   "Initiate a verify operation on SIGNATURE.
 SIGNATURE and SIGNED-TEXT are a data object if they are specified.
@@ -2045,7 +2040,6 @@ If you are unsure, use synchronous version of this function
       (if (eq (process-status (epg-context-process context)) 'run)
           (process-send-eof (epg-context-process context))))))
 
-;;;###autoload
 (defun epg-verify-file (context signature &optional signed-text plain)
   "Verify a file SIGNATURE.
 SIGNED-TEXT and PLAIN are also a file if they are specified.
@@ -2073,7 +2067,6 @@ stored into the file after successful verification."
       (epg-delete-output-file context))
     (epg-reset context)))
 
-;;;###autoload
 (defun epg-verify-string (context signature &optional signed-text)
   "Verify a string SIGNATURE.
 SIGNED-TEXT is a string if it is specified.
@@ -2104,7 +2097,6 @@ successful verification."
           (delete-file input-file))
       (epg-reset context))))
 
-;;;###autoload
 (defun epg-start-sign (context plain &optional mode)
   "Initiate a sign operation on PLAIN.
 PLAIN is a data object.
@@ -2150,7 +2142,6 @@ If you are unsure, use synchronous version of this function
     (if (eq (process-status (epg-context-process context)) 'run)
         (process-send-eof (epg-context-process context)))))
 
-;;;###autoload
 (defun epg-sign-file (context plain signature &optional mode)
   "Sign a file PLAIN and store the result to a file SIGNATURE.
 If SIGNATURE is nil, it returns the result as a string.
@@ -2176,7 +2167,6 @@ Otherwise, it makes a cleartext signature."
       (epg-delete-output-file context))
     (epg-reset context)))
 
-;;;###autoload
 (defun epg-sign-string (context plain &optional mode)
   "Sign a string PLAIN and return the output as string.
 If optional 3rd argument MODE is t or 'detached, it makes a detached signature.
@@ -2214,7 +2204,6 @@ Otherwise, it makes a cleartext signature."
           (delete-file input-file))
       (epg-reset context))))
 
-;;;###autoload
 (defun epg-start-encrypt (context plain recipients
                                   &optional sign always-trust)
   "Initiate an encrypt operation on PLAIN.
@@ -2265,7 +2254,6 @@ If you are unsure, use synchronous version of this function
     (if (eq (process-status (epg-context-process context)) 'run)
         (process-send-eof (epg-context-process context)))))
 
-;;;###autoload
 (defun epg-encrypt-file (context plain recipients
                                  cipher &optional sign always-trust)
   "Encrypt a file PLAIN and store the result to a file CIPHER.
@@ -2295,7 +2283,6 @@ If RECIPIENTS is nil, it performs symmetric encryption."
       (epg-delete-output-file context))
     (epg-reset context)))
 
-;;;###autoload
 (defun epg-encrypt-string (context plain recipients
                                    &optional sign always-trust)
   "Encrypt a string PLAIN.
@@ -2337,7 +2324,6 @@ If RECIPIENTS is nil, it performs symmetric encryption."
           (delete-file input-file))
       (epg-reset context))))
 
-;;;###autoload
 (defun epg-start-export-keys (context keys)
   "Initiate an export keys operation.
 
@@ -2355,7 +2341,6 @@ If you are unsure, use synchronous version of this function
                                (car (epg-key-sub-key-list key))))
                             keys))))
 
-;;;###autoload
 (defun epg-export-keys-to-file (context keys file)
   "Extract public KEYS."
   (unwind-protect
@@ -2375,12 +2360,10 @@ If you are unsure, use synchronous version of this function
       (epg-delete-output-file context))
     (epg-reset context)))
 
-;;;###autoload
 (defun epg-export-keys-to-string (context keys)
   "Extract public KEYS and return them as a string."
   (epg-export-keys-to-file context keys nil))
 
-;;;###autoload
 (defun epg-start-import-keys (context keys)
   "Initiate an import keys operation.
 KEYS is a data object.
@@ -2412,17 +2395,14 @@ If you are unsure, use synchronous version of this function
                    (epg-context-result-for context 'error))))
     (epg-reset context)))
 
-;;;###autoload
 (defun epg-import-keys-from-file (context keys)
   "Add keys from a file KEYS."
   (epg--import-keys-1 context (epg-make-data-from-file keys)))
 
-;;;###autoload
 (defun epg-import-keys-from-string (context keys)
   "Add keys from a string KEYS."
   (epg--import-keys-1 context (epg-make-data-from-string keys)))
 
-;;;###autoload
 (defun epg-start-receive-keys (context key-id-list)
   "Initiate a receive key operation.
 KEY-ID-LIST is a list of key IDs.
@@ -2436,7 +2416,6 @@ If you are unsure, use synchronous version of this function
   (epg-context-set-result context nil)
   (epg--start context (cons "--recv-keys" key-id-list)))
 
-;;;###autoload
 (defun epg-receive-keys (context keys)
   "Add keys from server.
 KEYS is a list of key IDs"
@@ -2449,10 +2428,8 @@ KEYS is a list of key IDs"
                    (epg-context-result-for context 'error))))
     (epg-reset context)))
 
-;;;###autoload
 (defalias 'epg-import-keys-from-server 'epg-receive-keys)
 
-;;;###autoload
 (defun epg-start-delete-keys (context keys &optional allow-secret)
   "Initiate a delete keys operation.
 
@@ -2472,7 +2449,6 @@ If you are unsure, use synchronous version of this function
                                 (car (epg-key-sub-key-list key))))
                              keys))))
 
-;;;###autoload
 (defun epg-delete-keys (context keys &optional allow-secret)
   "Delete KEYS from the key ring."
   (unwind-protect
@@ -2488,7 +2464,6 @@ If you are unsure, use synchronous version of this function
                 (error "Delete keys failed")))))
     (epg-reset context)))
 
-;;;###autoload
 (defun epg-start-sign-keys (context keys &optional local)
   "Initiate a sign keys operation.
 
@@ -2509,7 +2484,6 @@ If you are unsure, use synchronous version of this function
                             keys))))
 (make-obsolete 'epg-start-sign-keys "do not use." "23.1")
 
-;;;###autoload
 (defun epg-sign-keys (context keys &optional local)
   "Sign KEYS from the key ring."
   (unwind-protect
@@ -2522,7 +2496,6 @@ If you are unsure, use synchronous version of this function
     (epg-reset context)))
 (make-obsolete 'epg-sign-keys "do not use." "23.1")
 
-;;;###autoload
 (defun epg-start-generate-key (context parameters)
   "Initiate a key generation.
 PARAMETERS specifies parameters for the key.
@@ -2544,7 +2517,6 @@ If you are unsure, use synchronous version of this function
     (if (eq (process-status (epg-context-process context)) 'run)
         (process-send-eof (epg-context-process context)))))
 
-;;;###autoload
 (defun epg-generate-key-from-file (context parameters)
   "Generate a new key pair.
 PARAMETERS is a file which tells how to create the key."
@@ -2557,7 +2529,6 @@ PARAMETERS is a file which tells how to create the key."
                    (epg-context-result-for context 'error))))
     (epg-reset context)))
 
-;;;###autoload
 (defun epg-generate-key-from-string (context parameters)
   "Generate a new key pair.
 PARAMETERS is a string which tells how to create the key."