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.

diff --git a/lisp/epa.el b/lisp/epa.el
index 16621659a6a77c4f27582633940344550f788114..c3938e90a717f745709fde448ce71a4f1f62233e 100644 (file)
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -56,9 +56,6 @@ If neither t nor nil, ask user for confirmation."
   :type 'integer
   :group 'epa)
 
-(define-obsolete-variable-alias
-  'epa-pinentry-mode 'epg-pinentry-mode "27.1")
-
 (defgroup epa-faces nil
   "Faces for epa-mode."
   :version "23.1"

diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 9d9bd7101e1eee3f214b8ceefe82404dddb5730b..98f458d9962822895aec15ae820292c58a0e4e10 100644 (file)
--- 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.