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 6297f4b108efa4502fa6a2fc7e35bb01784e9b74..849792d580cfdd12f1abe134be36fb7a4ecbbd57 100644 (file)
--- 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 490286c6c8d8c8f58013fbb0ea17517b22ce5feb..22074107cfa0e00a09e878b234a997388d4c0d60 100644 (file)
--- 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 ee03f80ef41bbe026e938d521626c2735607d3b2..3c08ee756ca850404df02fd2d489cc657a48df0e 100644 (file)
--- 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 07e54221e503f0eb69edcf6b8341bae11cf3bd74..c58b1cf2ecca4723fb6c8f087276713172d962b4 100644 (file)
--- 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 8f0d3189f3635b54cc59e35523ad6b205d9b79cf..6b38731fbc49218b95a0ad40138bbfafed9f1541 100644 (file)
--- 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 9edf623d5ff8bbd66bd8a4d02610db182b1688cc..49b5d428103bca5f7d866b6a8cd7c72bd7a7dc9b 100644 (file)
--- 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 987dcfdba0567886b19566ce6978c465f57673d1..e63f10343c7f406dff6f91f96b15e8034d76df76 100644 (file)
--- 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 20e4f8f27f7a4447fdc121522af2ce93471ab937..719212529d9e93bd7f43222722d0ef04d83a74b0 100644 (file)
--- 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 e2ae9068b02b31255ffad1da57feabc247ed995c..d7dfac02fa6b1e80674493853dea836ac40ce115 100644 (file)
--- 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 40f8f3d4c905852da8110cb467b4d14d4c5814a8..b93d89bdbf02d901879a9d47240f3a51c2ac7db8 100644 (file)
--- 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 356b6be9251a5b3a4a91e9681e6a9422d9d723e6..d09490a77c71c12bf4c0cebca6f8ed487d88b73b 100644 (file)
--- 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 7ca8ef7d8c5680a1a8908494c697f1790e590e7b..7d27879717bb82c6346ed7f9923314baee6dac75 100644 (file)
--- 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 9a72d81e7754098da1c4b2f9f9267cb1a3f1c831..f3210269eeeb94c45cdb603ab196e000202908fc 100644 (file)
--- 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 60e1dfb7ce942bd8927c6458681ddcd084de0bdc..564dab429c417f6ab750d26f9906f104f3e30843 100644 (file)
--- 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 fe1ec32946394520ca1182adae7ef3478e6123a0..e63818e462df8bef362c5e0a9a4498505683c180 100644 (file)
--- 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 4e78ea8eed8eed519bd9b86072b9fd656370faf5..f4d35a9896448afb5f368e90649a815056c4e152 100644 (file)
--- 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 09d08815a4944f72e2bd0509cbb1ca176a407b7e..0365e6c0eb281a4aab4f69923b4536dda9363000 100644 (file)
--- 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 c997f244c46a5612e49cd15ea40f6b41e51561b0..a63baf1c6f512711bf30579844123b6bb31086bc 100644 (file)
--- 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 69994bf7f8b351a68b8918074981e1ca68afa5df..3eb31f2d64ed304981ace481e436af513ae9806a 100644 (file)
--- 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 df98684938881b45086c251fe274ee1b87289c66..ab916c8c2cf532cf75b13822a2614ffe12bbc5a3 100644 (file)
--- 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 2048f67a783e333b46363177e09796f3080935be..23d6a38eaff147373b76d77a13beaab9bc972812 100644 (file)
--- 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 557ad72e37be58654a193c246218d7e77fae4825..13e7351c136777aea8436e19c0f73812df20d6b1 100644 (file)
--- 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 aa39699c41bb0cf92f2159129186c9731a71ce81..4d1c92de21c9c6d44ef872088acd1b1f9a9ab718 100644 (file)
--- 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 8e086c56c677b7e00c786308e3830a7322079a10..5ba29507bc3dc329e31e7cd291a6543e299deccd 100644 (file)
--- 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 ee8a444caea197cd519bc61f8b8b4d050483dade..16bedd1144017c268247d9737984b7e7fe9f3294 100644 (file)
--- 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 7277a3a7754203906cc0a1ccccabb9ccd353478a..d7aa9a4c6f380b37be224354b0af13f926ccb82f 100644 (file)
--- 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 9b7431197eede2be8935715a0bb0bbb2fa9b0fe7..df019d8e148a1d2abdfac605aba2c4ff8e810acc 100644 (file)
--- 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 deb90f8750b3390064b93d1a72785ddf8274f666..1692943214b6fcc9458a01edaceb1b5c9c9d6b86 100644 (file)
--- 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 ba4e3b22f9e4961c5ef82102187d20608c50f85a..721e2abf3e07cf680bb28fad8db0d99c4c7cec17 100644 (file)
--- 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 6ef96c39ad81a09a77a2be58191d1732f1b8d89f..19d3ff0bd3b242e58c4a0001b68e6633b687bbbd 100644 (file)
--- 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"