From: Richard Russon <rich@flatcap.org>
Date: Tue, 1 Jan 2019 11:23:31 +0000 (+0000)
Subject: rename menu.h back to mutt_menu.h
X-Git-Tag: 2019-10-25~411
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06d22fbb31ca7613ea8166fef44a05516f6a97f4;p=neomutt

rename menu.h back to mutt_menu.h

The short name causes a clash with ncurses on MacPort.
---

diff --git a/addrbook.c b/addrbook.c
index 6297f4b10..849792d58 100644
--- a/addrbook.c
+++ b/addrbook.c
@@ -39,7 +39,7 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "keymap.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
diff --git a/browser.c b/browser.c
index 490286c6c..22074107c 100644
--- a/browser.c
+++ b/browser.c
@@ -54,7 +54,7 @@
 #include "keymap.h"
 #include "mailbox.h"
 #include "maildir/lib.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_attach.h"
 #include "mutt_window.h"
 #include "muttlib.h"
diff --git a/color.c b/color.c
index ee03f80ef..3c08ee756 100644
--- a/color.c
+++ b/color.c
@@ -40,7 +40,7 @@
 #include "globals.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "options.h"
 #include "pattern.h"
diff --git a/commands.c b/commands.c
index 07e54221e..c58b1cf2e 100644
--- a/commands.c
+++ b/commands.c
@@ -51,7 +51,7 @@
 #include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_parse.h"
diff --git a/compose.c b/compose.c
index 8f0d3189f..6b38731fb 100644
--- a/compose.c
+++ b/compose.c
@@ -53,7 +53,7 @@
 #include "index.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_attach.h"
 #include "mutt_curses.h"
 #include "mutt_header.h"
diff --git a/conn/ssl.c b/conn/ssl.c
index 9edf623d5..49b5d4281 100644
--- a/conn/ssl.c
+++ b/conn/ssl.c
@@ -57,7 +57,7 @@
 #include "connection.h"
 #include "globals.h"
 #include "keymap.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
 #include "muttlib.h"
diff --git a/conn/ssl_gnutls.c b/conn/ssl_gnutls.c
index 987dcfdba..e63f10343 100644
--- a/conn/ssl_gnutls.c
+++ b/conn/ssl_gnutls.c
@@ -43,7 +43,7 @@
 #include "connaccount.h"
 #include "connection.h"
 #include "keymap.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_account.h"
 #include "muttlib.h"
 #include "opcodes.h"
diff --git a/curs_lib.c b/curs_lib.c
index 20e4f8f27..719212529 100644
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -52,7 +52,7 @@
 #include "enter_state.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_window.h"
diff --git a/flags.c b/flags.c
index e2ae9068b..d7dfac02f 100644
--- a/flags.c
+++ b/flags.c
@@ -38,7 +38,7 @@
 #include "globals.h"
 #include "index.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"
 #include "mx.h"
diff --git a/imap/command.c b/imap/command.c
index 40f8f3d4c..b93d89bdb 100644
--- a/imap/command.c
+++ b/imap/command.c
@@ -48,7 +48,7 @@
 #include "globals.h"
 #include "imap/imap.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "message.h"
 #include "mutt_account.h"
 #include "mutt_logging.h"
diff --git a/index.c b/index.c
index 356b6be92..d09490a77 100644
--- a/index.c
+++ b/index.c
@@ -52,7 +52,7 @@
 #include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_account.h"
 #include "mutt_curses.h"
 #include "mutt_header.h"
diff --git a/init.c b/init.c
index 7ca8ef7d8..7d2787971 100644
--- a/init.c
+++ b/init.c
@@ -50,7 +50,7 @@
 #include "filter.h"
 #include "hcache/hcache.h"
 #include "keymap.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"
 #include "mx.h"
diff --git a/init.h b/init.h
index 9a72d81e7..f3210269e 100644
--- a/init.h
+++ b/init.h
@@ -52,7 +52,7 @@
 #include "mailbox.h"
 #include "maildir/lib.h"
 #include "main.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_account.h"
 #include "mutt_commands.h"
 #include "mutt_history.h"
diff --git a/mailbox.c b/mailbox.c
index 60e1dfb7c..564dab429 100644
--- a/mailbox.c
+++ b/mailbox.c
@@ -47,7 +47,7 @@
 #include "globals.h"
 #include "maildir/lib.h"
 #include "mbox/mbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"
diff --git a/main.c b/main.c
index fe1ec3294..e63818e46 100644
--- a/main.c
+++ b/main.c
@@ -58,7 +58,7 @@
 #include "index.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_attach.h"
 #include "mutt_curses.h"
 #include "mutt_history.h"
diff --git a/menu.c b/menu.c
index 4e78ea8ee..f4d35a989 100644
--- a/menu.c
+++ b/menu.c
@@ -35,7 +35,7 @@
 #include "mutt/mutt.h"
 #include "email/lib.h"
 #include "mutt.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "color.h"
 #include "commands.h"
 #include "context.h"
diff --git a/mutt_history.c b/mutt_history.c
index 09d08815a..0365e6c0e 100644
--- a/mutt_history.c
+++ b/mutt_history.c
@@ -33,7 +33,7 @@
 #include "curs_lib.h"
 #include "format_flags.h"
 #include "keymap.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "opcodes.h"
diff --git a/menu.h b/mutt_menu.h
similarity index 100%
rename from menu.h
rename to mutt_menu.h
diff --git a/mutt_window.c b/mutt_window.c
index c997f244c..a63baf1c6 100644
--- a/mutt_window.c
+++ b/mutt_window.c
@@ -32,7 +32,7 @@
 #include "mutt/mutt.h"
 #include "mutt_window.h"
 #include "globals.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "options.h"
 
 struct MuttWindow *MuttHelpWindow = NULL;    /**< Help Window */
diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 69994bf7f..3eb31f2d6 100644
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -60,7 +60,7 @@
 #include "handler.h"
 #include "hook.h"
 #include "keymap.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_attach.h"
 #include "mutt_logging.h"
 #include "mutt_window.h"
diff --git a/ncrypt/pgpkey.c b/ncrypt/pgpkey.c
index df9868493..ab916c8c2 100644
--- a/ncrypt/pgpkey.c
+++ b/ncrypt/pgpkey.c
@@ -49,7 +49,7 @@
 #include "globals.h"
 #include "gnupgparse.h"
 #include "keymap.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_logging.h"
 #include "mutt_window.h"
 #include "muttlib.h"
diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index 2048f67a7..23d6a38ea 100644
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -50,7 +50,7 @@
 #include "globals.h"
 #include "handler.h"
 #include "keymap.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_logging.h"
 #include "mutt_window.h"
diff --git a/pager.c b/pager.c
index 557ad72e3..13e7351c1 100644
--- a/pager.c
+++ b/pager.c
@@ -55,7 +55,7 @@
 #include "index.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_attach.h"
 #include "mutt_curses.h"
 #include "mutt_header.h"
diff --git a/pattern.c b/pattern.c
index aa39699c4..4d1c92de2 100644
--- a/pattern.c
+++ b/pattern.c
@@ -52,7 +52,7 @@
 #include "handler.h"
 #include "hdrline.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_logging.h"
 #include "mutt_parse.h"
 #include "muttlib.h"
diff --git a/postpone.c b/postpone.c
index 8e086c56c..5ba29507b 100644
--- a/postpone.c
+++ b/postpone.c
@@ -47,7 +47,7 @@
 #include "hdrline.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_logging.h"
 #include "mutt_thread.h"
 #include "muttlib.h"
diff --git a/query.c b/query.c
index ee8a444ca..16bedd114 100644
--- a/query.c
+++ b/query.c
@@ -41,7 +41,7 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "keymap.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_logging.h"
 #include "mutt_window.h"
 #include "muttlib.h"
diff --git a/recvattach.c b/recvattach.c
index 7277a3a77..d7aa9a4c6 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -50,7 +50,7 @@
 #include "hook.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_attach.h"
 #include "mutt_logging.h"
 #include "mutt_parse.h"
diff --git a/remailer.c b/remailer.c
index 9b7431197..df019d8e1 100644
--- a/remailer.c
+++ b/remailer.c
@@ -39,7 +39,7 @@
 #include "filter.h"
 #include "format_flags.h"
 #include "keymap.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"
 #include "muttlib.h"
diff --git a/score.c b/score.c
index deb90f875..169294321 100644
--- a/score.c
+++ b/score.c
@@ -38,7 +38,7 @@
 #include "globals.h"
 #include "keymap.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "options.h"
 #include "pattern.h"
 #include "protos.h"
diff --git a/sidebar.c b/sidebar.c
index ba4e3b22f..721e2abf3 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -42,7 +42,7 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_curses.h"
 #include "mutt_window.h"
 #include "muttlib.h"
diff --git a/status.c b/status.c
index 6ef96c39a..19d3ff0bd 100644
--- a/status.c
+++ b/status.c
@@ -33,7 +33,7 @@
 #include "format_flags.h"
 #include "globals.h"
 #include "mailbox.h"
-#include "menu.h"
+#include "mutt_menu.h"
 #include "mutt_window.h"
 #include "muttlib.h"
 #include "mx.h"