rename: curs_main.c to index.c

diff --git a/Makefile.autosetup b/Makefile.autosetup
index 7460dd7e2930d151af8b84e5c192424b70ab7f64..17acdc6948d27969cc318983035d73e9bc4463f6 100644 (file)
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -63,9 +63,9 @@ ALL_FILES!=   (cd $(SRCDIR) && git ls-files 2>/dev/null) || true
 NEOMUTT=       neomutt$(EXEEXT)
 NEOMUTTOBJS=   account.o addrbook.o alias.o bcache.o browser.o color.o commands.o \
                complete.o compose.o compress.o conststrings.o copy.o \
-               curs_lib.o curs_main.o edit.o editmsg.o enriched.o enter.o \
+               curs_lib.o edit.o editmsg.o enriched.o enter.o \
                filter.o flags.o group.o handler.o hdrline.o help.o hook.o \
-               init.o keymap.o mailbox.o main.o menu.o muttlib.o \
+               index.o init.o keymap.o mailbox.o main.o menu.o muttlib.o \
                mutt_account.o mutt_attach.o mutt_body.o mutt_header.o \
                mutt_history.o mutt_logging.o mutt_parse.o mutt_signal.o \
                mutt_socket.o mutt_thread.o mutt_url.o mutt_window.o mx.o myvar.o \

diff --git a/compose.c b/compose.c
index e620b42bb1c2f1666ab7d3602f2073530a6d68f2..60446e7dc5914f40c07cb55911ed1db1577ae93a 100644 (file)
--- a/compose.c
+++ b/compose.c
@@ -40,11 +40,11 @@
 #include "commands.h"
 #include "context.h"
 #include "curs_lib.h"
-#include "curs_main.h"
 #include "edit.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "hook.h"
+#include "index.h"
 #include "keymap.h"
 #include "mailbox.h"
 #include "menu.h"

diff --git a/flags.c b/flags.c
index a9fccb44d7b9798eb423c7a346afa10c603e2e5b..0be046a33ea9b53201691cbf14acc84f88a86a4b 100644 (file)
--- a/flags.c
+++ b/flags.c
@@ -35,8 +35,8 @@
 #include "mutt.h"
 #include "context.h"
 #include "curs_lib.h"
-#include "curs_main.h"
 #include "globals.h"
+#include "index.h"
 #include "mailbox.h"
 #include "menu.h"
 #include "mutt_curses.h"

diff --git a/imap/command.c b/imap/command.c
index cf1438b5e5fa7602e737610f5980850f19e1cbf4..37c8d0f50efbf843f89750af0ec3c911dce0de0d 100644 (file)
--- a/imap/command.c
+++ b/imap/command.c
@@ -1324,7 +1324,7 @@ void imap_cmd_finish(struct ImapAccountData *adata)
     {
       /* read new mail messages */
       mutt_debug(2, "Fetching new mail\n");
-      /* check_status: curs_main uses imap_check_mailbox to detect
+      /* check_status: index uses imap_check_mailbox to detect
        *   whether the index needs updating */
       adata->check_status = IMAP_NEWMAIL_PENDING;
       imap_read_headers(adata, adata->max_msn + 1, count, false);

diff --git a/imap/imap.c b/imap/imap.c
index 7b2d4cbc6b37529ac9efb35fad3431f7f94b772a..b31a87b52efb9b6e38d062030141b027f9dca00d 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -747,7 +747,7 @@ void imap_logout_all(void)
 
     struct ImapAccountData *adata = np->adata;
     if (!adata)
-        continue;
+      continue;
 
     struct Connection *conn = adata->conn;
     if (!conn || (conn->fd < 0))

diff --git a/curs_main.c b/index.c
similarity index 99%
rename from curs_main.c
rename to index.c
index 673b8802140dd7e28fa509b66bb8d94af2c1e738..8fe11e412f02fc73a2d283967ac7ca9b89258bc6 100644 (file)
--- a/curs_main.c
+++ b/index.c
@@ -33,7 +33,7 @@
 #include "email/lib.h"
 #include "conn/conn.h"
 #include "mutt.h"
-#include "curs_main.h"
+#include "index.h"
 #include "account.h"
 #include "alias.h"
 #include "browser.h"
@@ -91,7 +91,7 @@
 #include "monitor.h"
 #endif
 
-/* These Config Variables are only used in curs_main.c */
+/* These Config Variables are only used in index.c */
 bool ChangeFolderNext; ///< Config: Suggest the next folder, rather than the first when using '<change-folder>'
 bool CollapseAll;      ///< Config: Collapse all threads when entering a folder
 bool CollapseFlagged; ///< Config: Prevent the collapse of threads with flagged emails

diff --git a/curs_main.h b/index.h
similarity index 91%
rename from curs_main.h
rename to index.h
index 1492555c51e8ddd99256320b43af8ecc6189fbb8..8aca52a735da814fcd756be52cf5f5464719be26 100644 (file)
--- a/curs_main.h
+++ b/index.h
@@ -20,8 +20,8 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef MUTT_CURS_MAIN_H
-#define MUTT_CURS_MAIN_H
+#ifndef MUTT_INDEX_H
+#define MUTT_INDEX_H
 
 #include <stdbool.h>
 #include <stdio.h>
@@ -30,7 +30,7 @@ struct Context;
 struct Email;
 struct Menu;
 
-/* These Config Variables are only used in curs_main.c */
+/* These Config Variables are only used in index.c */
 extern bool  ChangeFolderNext;
 extern bool  CollapseAll;
 extern bool  CollapseFlagged;
@@ -47,4 +47,4 @@ int  mutt_index_menu(void);
 void mutt_set_header_color(struct Context *ctx, struct Email *curhdr);
 void update_index(struct Menu *menu, struct Context *ctx, int check, int oldcount, int index_hint);
 
-#endif /* MUTT_CURS_MAIN_H */
+#endif /* MUTT_INDEX_H */

diff --git a/init.h b/init.h
index c71fb2591941b54dec7b52b8d22b6d6932580cf3..5cfb12b8ab6e5c83a4916929a354a503432a6260 100644 (file)
--- a/init.h
+++ b/init.h
@@ -41,7 +41,7 @@
 #include "commands.h"
 #include "compose.h"
 #include "curs_lib.h"
-#include "curs_main.h"
+#include "index.h"
 #include "edit.h"
 #include "globals.h"
 #include "group.h"

diff --git a/main.c b/main.c
index 80a386a29cdd1edf263cc54e93a27e6e9660182f..4db8c4b0bfad4a37a7a1aea9961895d961285760 100644 (file)
--- a/main.c
+++ b/main.c
@@ -53,9 +53,9 @@
 #include "color.h"
 #include "context.h"
 #include "curs_lib.h"
-#include "curs_main.h"
 #include "globals.h"
 #include "hook.h"
+#include "index.h"
 #include "keymap.h"
 #include "mailbox.h"
 #include "menu.h"

diff --git a/mbox/mbox.c b/mbox/mbox.c
index 492a52944d6c0ed18b2cd8b8efdf02e59071a2f6..1544786466016b8d46587f8de45014dc52795352 100644 (file)
--- a/mbox/mbox.c
+++ b/mbox/mbox.c
@@ -1085,8 +1085,7 @@ static int mbox_mbox_check(struct Context *ctx, int *index_hint)
         mutt_debug(1, "#1 fseek() failed\n");
       if (fgets(buffer, sizeof(buffer), adata->fp))
       {
-        if ((m->magic == MUTT_MBOX &&
-             mutt_str_startswith(buffer, "From ", CASE_MATCH)) ||
+        if ((m->magic == MUTT_MBOX && mutt_str_startswith(buffer, "From ", CASE_MATCH)) ||
             (m->magic == MUTT_MMDF && (mutt_str_strcmp(buffer, MMDF_SEP) == 0)))
         {
           if (fseeko(adata->fp, m->size, SEEK_SET) != 0)

diff --git a/mutt_header.c b/mutt_header.c
index 583a6466a79906e69859bc0059ef6f1f9b76d5b6..cf654c38f582f00ad35935501054930c904b66f7 100644 (file)
--- a/mutt_header.c
+++ b/mutt_header.c
@@ -33,8 +33,8 @@
 #include "alias.h"
 #include "context.h"
 #include "curs_lib.h"
-#include "curs_main.h"
 #include "globals.h"
+#include "index.h"
 #include "mailbox.h"
 #include "muttlib.h"
 #include "ncrypt/ncrypt.h"

diff --git a/notmuch/mutt_notmuch.c b/notmuch/mutt_notmuch.c
index 505d1edf1c87caf089847df21fd02626783398ba..fbb29b67adae9a76ca52fbcbf486ad715261c55b 100644 (file)
--- a/notmuch/mutt_notmuch.c
+++ b/notmuch/mutt_notmuch.c
@@ -62,8 +62,8 @@
 #include "account.h"
 #include "context.h"
 #include "curs_lib.h"
-#include "curs_main.h"
 #include "globals.h"
+#include "index.h"
 #include "mailbox.h"
 #include "maildir/maildir.h"
 #include "mutt_logging.h"

diff --git a/pager.c b/pager.c
index 9f8cfdcc8f58349c56b4a85dee722e7b349d1e6d..1ff3f34a5c6e66ac8314d62404d95958897049a1 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -41,11 +41,11 @@
 #include "commands.h"
 #include "context.h"
 #include "curs_lib.h"
-#include "curs_main.h"
 #include "format_flags.h"
 #include "globals.h"
 #include "hdrline.h"
 #include "hook.h"
+#include "index.h"
 #include "keymap.h"
 #include "mailbox.h"
 #include "menu.h"