From 7f2e98d3f8d894da86e6d3367cee6702c332f614 Mon Sep 17 00:00:00 2001
From: Thomas Roessler <roessler@does-not-exist.org>
Date: Sat, 12 Dec 1998 09:16:37 +0000
Subject: [PATCH] More _PGPPATH and us dist related fixes.

---
 curs_main.c | 5 ++---
 hook.c      | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/curs_main.c b/curs_main.c
index de58e0037..c0d88404e 100644
--- a/curs_main.c
+++ b/curs_main.c
@@ -1078,10 +1078,9 @@ int mutt_index_menu (void)
 			       (op == OP_SAVE) || (op == OP_DECODE_SAVE),
 			       (op == OP_DECODE_SAVE) || (op == OP_DECODE_COPY),
 #ifdef _PGPPATH
-			       (op == OP_DECRYPT_SAVE) || (op == OP_DECRYPT_COPY),
-#else
-			       0,
+			       (op == OP_DECRYPT_SAVE) || (op == OP_DECRYPT_COPY) ||
 #endif
+			       0,
 			       &menu->redraw) == 0 &&
 	    (op == OP_SAVE || op == OP_DECODE_SAVE
 #ifdef _PGPPATH
diff --git a/hook.c b/hook.c
index a0223451f..748269c83 100644
--- a/hook.c
+++ b/hook.c
@@ -153,7 +153,7 @@ int mutt_parse_hook (BUFFER *buf, BUFFER *s, unsigned long data, BUFFER *err)
   else
   {
     rx = safe_malloc (sizeof (regex_t));
-#ifdef _PGPPATH
+#ifdef M_PGPHOOK
     if ((rc = REGCOMP (rx, pattern.data, ((data & M_PGPHOOK) ? REG_ICASE : 0))) != 0)
 #else
     if ((rc = REGCOMP (rx, pattern.data, 0)) != 0)
-- 
2.40.0