From: Basil L. Contovounesios <contovob@tcd.ie>
Date: Sat, 26 May 2018 11:09:15 +0000 (+0100)
Subject: Place epg-pinentry-mode varalias before defcustom
X-Git-Tag: emacs-27.0.90~4983
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=584f05cb11a8010f31beaf07c9ef4180b70d1d66;p=emacs.git

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 16621659a6a..c3938e90a71 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 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.