summaryrefslogtreecommitdiff
path: root/lisp/epa.el
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2020-08-12 18:43:06 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2020-08-12 18:43:06 +0200
commite97d3e1a268c33ed6da420fa1d3a18268a1f6b91 (patch)
treef787770cc02c3b63f3f72b9a18b7351e2e31017a /lisp/epa.el
parentaf6ea5578abf01d97abd86735bbddd08251ec11e (diff)
downloademacs-e97d3e1a268c33ed6da420fa1d3a18268a1f6b91.tar.gz
emacs-e97d3e1a268c33ed6da420fa1d3a18268a1f6b91.tar.bz2
emacs-e97d3e1a268c33ed6da420fa1d3a18268a1f6b91.zip
Remove some compat code from epa.el
* lisp/epa.el (epa--derived-mode-p, epa-import-keys): Make defalias obsolete, and adjust a comment.
Diffstat (limited to 'lisp/epa.el')
-rw-r--r--lisp/epa.el13
1 files changed, 2 insertions, 11 deletions
diff --git a/lisp/epa.el b/lisp/epa.el
index 3c7dd8309a8..a2c5fb46737 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -1105,16 +1105,7 @@ If no one is selected, default secret key is used. "
'start-open t
'end-open t)))))
-(defalias 'epa--derived-mode-p
- (if (fboundp 'derived-mode-p)
- #'derived-mode-p
- (lambda (&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."
- (let ((parent major-mode))
- (while (and (not (memq parent modes))
- (setq parent (get parent 'derived-mode-parent))))
- parent))))
+(define-obsolete-function-alias 'epa--derived-mode-p 'derived-mode-p "28.1")
;;;###autoload
(defun epa-encrypt-region (start end recipients sign signers)
@@ -1227,7 +1218,7 @@ If no one is selected, symmetric encryption will be performed. ")
(if (epg-context-result-for context 'import)
(epa-display-info (epg-import-result-to-string
(epg-context-result-for context 'import))))
- ;; FIXME: Why not use the (otherwise unused) epa--derived-mode-p?
+ ;; FIXME: Why not use the derived-mode-p?
(if (eq major-mode 'epa-key-list-mode)
(apply #'epa--list-keys epa-list-keys-arguments))))