* epa.el (epa-import-mail): Renamed from epa-import.

diff --git a/ChangeLog b/ChangeLog
index 713f2fa..25edac7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@
        (epa-verify-mail): Renamed from epa-verify.
        (epa-sign-mail): Renamed from epa-sign.
        (epa-encrypt-mail): Renamed from epa-encrypt.
+       (epa-import-mail): Renamed from epa-import.
 
        * configure.ac: Don't exit if GnuPG (>= 1.4.3) is unavailable.
 

diff --git a/epa.el b/epa.el
index cf91e16..579e9a3 100644 (file)
--- a/epa.el
+++ b/epa.el
@@ -1176,8 +1176,9 @@ Don't use this command in Lisp programs!"
          (epa-import-keys-region armor-start armor-end))))))
 
 ;;;###autoload
-(defun epa-import ()
+(defun epa-import-mail ()
   "Import keys in the OpenPGP armor format in the current buffer.
+The buffer is expected to contain a mail message.
 
 Don't use this command in Lisp programs!"
   (interactive)