summaryrefslogtreecommitdiff
path: root/lisp/epg-config.el
diff options
context:
space:
mode:
authorBasil L. Contovounesios <contovob@tcd.ie>2018-05-26 12:09:15 +0100
committerNoam Postavsky <npostavs@gmail.com>2018-05-27 14:14:35 -0400
commit584f05cb11a8010f31beaf07c9ef4180b70d1d66 (patch)
treefdf899349038161a55519079d60ef9033f304edf /lisp/epg-config.el
parenta37166eb80458e87880893e7b8aa98a2a7ce394b (diff)
downloademacs-584f05cb11a8010f31beaf07c9ef4180b70d1d66.tar.gz
emacs-584f05cb11a8010f31beaf07c9ef4180b70d1d66.tar.bz2
emacs-584f05cb11a8010f31beaf07c9ef4180b70d1d66.zip
Place epg-pinentry-mode varalias before defcustom
This is needed to avoid losing user settings made under the obsolete name (Bug#31603). * lisp/epa.el (epa-pinentry-mode): Move obsolete varalias from here... * lisp/epg-config.el (epg-pinentry-mode): ...to here.
Diffstat (limited to 'lisp/epg-config.el')
-rw-r--r--lisp/epg-config.el2
1 files changed, 2 insertions, 0 deletions
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 9d9bd7101e1..98f458d9962 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -69,6 +69,8 @@ instead use \\[customize] (see the info node `Easy Customization')."
"Coding system to use with messages from `epg-gpg-program'."
:type 'symbol)
+(define-obsolete-variable-alias
+ 'epa-pinentry-mode 'epg-pinentry-mode "27.1")
;; In the doc string below, we say "symbol `error'" to avoid producing
;; a hyperlink for `error' the function.