From e0577acadc471ffe64fb31a2a3ea457046cf1944 Mon Sep 17 00:00:00 2001
From: "Basil L. Contovounesios" <contovob@tcd.ie>
Date: Sat, 26 May 2018 12:09:15 +0100
Subject: [PATCH] Place epg-pinentry-mode varalias before defcustom

* lisp/epa.el (epa-pinentry-mode):
Move obsolete varalias from here...
* lisp/epg-config.el (epg-pinentry-mode): ...to here. (bug#31603)
---
 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 16621659a6..c3938e90a7 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -56,9 +56,6 @@ epa-info-window-height
   :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 9d9bd7101e..98f458d996 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -69,6 +69,8 @@ epg-passphrase-coding-system
   "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.
-- 
2.17.0