[Emacs-diffs] master 584f05c: Place epg-pinentry-mode varalias before defcustom

[Noam Postavsky]

branch: master
commit 584f05cb11a8010f31beaf07c9ef4180b70d1d66
Author: Basil L. Contovounesios <address@hidden>
Commit: Noam Postavsky <address@hidden>

    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.
---
 lisp/epa.el        | 3 ---
 lisp/epg-config.el | 2 ++
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/lisp/epa.el b/lisp/epa.el
index 1662165..c3938e9 100644
--- 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 9d9bd71..98f458d 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.