summaryrefslogtreecommitdiff
path: root/lisp/epa-mail.el
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2018-04-30 08:49:11 -0400
committerNoam Postavsky <npostavs@gmail.com>2018-05-23 07:53:57 -0400
commit21ab346a07eff8ba43cb2738dc6752f012b77670 (patch)
tree649652b71d097f51d0273dff34acba4e98e392e2 /lisp/epa-mail.el
parentbab73230d1be1fe394b7269c1365ef6fb1a5d9b3 (diff)
downloademacs-21ab346a07eff8ba43cb2738dc6752f012b77670.tar.gz
Drop some epg/epa backwards compat code for ancient Emacs versions
* lisp/epa.el (epa--select-safe-coding-system): Remove, `select-safe-coding-system' has been present since Emacs 20.3. (epa--encode-coding-string, epa--decode-coding-string): * lisp/epg.el (epg--decode-coding-string, epg--encode-coding-string) (epg--clear-string): Remove, the corresponding Emacs functions are so old they don't show up in NEWS. Furthermore, the fallback for the *-coding-string functions was `identity' which wouldn't have worked anyway, since it only takes a single argument. (epg--make-temp-file): Remove, `make-temp-file' has been present since Emacs 21.1. * lisp/epg-config.el (epg-gpg-program, epg-gpgsm-program) (epg-gpgconf-program, epg-gpg-home-directory) (epg-passphrase-coding-system, epg-debug): Remove unneeded :group parameter.
Diffstat (limited to 'lisp/epa-mail.el')
-rw-r--r--lisp/epa-mail.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index c819f6734c7..7f4c28e9670 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -95,7 +95,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
@@ -222,7 +222,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))