diff options
Diffstat (limited to 'lisp/epa-mail.el')
| -rw-r--r-- | lisp/epa-mail.el | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el index 077666ac897..008593712bd 100644 --- a/lisp/epa-mail.el +++ b/lisp/epa-mail.el @@ -47,10 +47,7 @@ ;;;###autoload (define-minor-mode epa-mail-mode - "A minor-mode for composing encrypted/clearsigned mails. -With a prefix argument ARG, enable the mode if ARG is positive, -and disable it otherwise. If called from Lisp, enable the mode -if ARG is omitted or nil." + "A minor-mode for composing encrypted/clearsigned mails." nil " epa-mail" epa-mail-mode-map) (defun epa-mail--find-usable-key (keys usage) @@ -95,7 +92,7 @@ The buffer is expected to contain a mail message." (forward-line)) (setq epa-last-coding-system-specified (or coding-system-for-write - (epa--select-safe-coding-system (point) (point-max)))) + (select-safe-coding-system (point) (point-max)))) (let ((verbose current-prefix-arg)) (list (point) (point-max) (if verbose @@ -111,7 +108,7 @@ If no one is selected, default secret key is used. " (defun epa-mail-default-recipients () "Return the default list of encryption recipients for a mail buffer." - (let ((config (epg-configuration)) + (let ((config (epg-find-configuration 'OpenPGP)) recipients-string real-recipients) (save-excursion (goto-char (point-min)) @@ -222,7 +219,7 @@ If no one is selected, symmetric encryption will be performed. " (setq epa-last-coding-system-specified (or coding-system-for-write - (epa--select-safe-coding-system (point) (point-max))))) + (select-safe-coding-system (point) (point-max))))) ;; Don't let some read-only text stop us from encrypting. (let ((inhibit-read-only t)) @@ -238,10 +235,7 @@ The buffer is expected to contain a mail message." ;;;###autoload (define-minor-mode epa-global-mail-mode - "Minor mode to hook EasyPG into Mail mode. -With a prefix argument ARG, enable the mode if ARG is positive, -and disable it otherwise. If called from Lisp, enable the mode -if ARG is omitted or nil." + "Minor mode to hook EasyPG into Mail mode." :global t :init-value nil :group 'epa-mail :version "23.1" (remove-hook 'mail-mode-hook 'epa-mail-mode) (if epa-global-mail-mode |