rename mutt_tags to tags

diff --git a/Makefile.am b/Makefile.am
index 1c729b69ea779101c32d375f92bcc30114774b70..e0bdbb4feb8a52d4a24877032982031161975510 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,7 +55,7 @@ neomutt_SOURCES = mutt_account.c addrbook.c address.h alias.c alias.h attach.c \
        query.c recvattach.c recvcmd.c rfc1524.c rfc2047.c rfc2231.c rfc3676.c \
        address.c safe_asprintf.c score.c send.c sendlib.c sidebar.c mutt_signal.c \
        smtp.c sort.c state.c state.h status.c system.c thread.c thread.h url.c \
-       version.c where.h mutt_tags.c
+       version.c where.h tags.c
 
 nodist_neomutt_SOURCES = $(BUILT_SOURCES)
 
@@ -93,7 +93,7 @@ EXTRA_DIST = mutt_account.h attach.h bcache.h browser.h buffy.h \
        mutt_socket.h mx.h myvar.h nntp.h opcodes.h pager.h \
        pgpewrap.c pop.h protos.h README.md README.SSL remailer.c remailer.h \
        rfc1524.h rfc2047.h rfc2231.h rfc3676.h sidebar.h \
-       sort.h txt2c.c txt2c.sh version.h mutt_tags.h
+       sort.h txt2c.c txt2c.sh version.h tags.h
 
 EXTRA_SCRIPTS =
 

diff --git a/Makefile.autosetup b/Makefile.autosetup
index a2d9f86016e7fce35143ef74325a4363cbfbfe9a..2d108c684b53d019c9cc8878ff195b6729c22b4b 100644 (file)
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -60,7 +60,7 @@ NEOMUTTOBJS=  mutt_account.o addrbook.o alias.o attach.o bcache.o body.o \
                flags.o from.o group.o handler.o hdrline.o \
                header.o help.o history.o hook.o init.o keymap.o main.o \
                mbox.o mbyte.o menu.o mh.o muttlib.o mutt_address.o mutt_idna.o \
-               mutt_socket.o mutt_tags.o mx.o \
+               mutt_socket.o tags.o mx.o \
                newsrc.o nntp.o pager.o parameter.o parse.o pattern.o pop.o \
                pop_auth.o pop_lib.o postpone.o query.o recvattach.o recvcmd.o \
                rfc1524.o rfc2047.o rfc2231.o rfc3676.o address.o \

diff --git a/copy.c b/copy.c
index 33767954ca706c2a12f02654a0d923305d028b2c..92116c9dea6d6b8c8cecf00071f463d3fc6e0966 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -38,13 +38,13 @@
 #include "mime.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
-#include "mutt_tags.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "protos.h"
 #include "rfc2047.h"
 #include "state.h"
+#include "tags.h"
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"
 #endif

diff --git a/curs_main.c b/curs_main.c
index 4dc126049d57901870b9cb5cd400c86a015a9925..5fab204054edeeb7b7c0c6ebff89369d01d225bb 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -46,7 +46,6 @@
 #include "mailbox.h"
 #include "mutt_curses.h"
 #include "mutt_menu.h"
-#include "mutt_tags.h"
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
@@ -54,6 +53,7 @@
 #include "pattern.h"
 #include "protos.h"
 #include "sort.h"
+#include "tags.h"
 #include "thread.h"
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/term.h>

diff --git a/globals.h b/globals.h
index 27395e655857a881ef5fc720d53eb52a8e475277..584285b850e39f11282768d8b5e2511d9dc0d3b0 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -184,8 +184,6 @@ WHERE const char *GitVer;
 
 WHERE struct Hash *Groups;
 WHERE struct Hash *ReverseAliases;
-WHERE char *HiddenTags;
-WHERE struct Hash *TagTransforms;
 WHERE struct Hash *TagFormats;
 
 WHERE struct ListHead AutoViewList INITVAL(STAILQ_HEAD_INITIALIZER(AutoViewList));

diff --git a/hcache/hcache.c b/hcache/hcache.c
index 19d7d3ef61dac28b55fdb8911db20134c0b1dd83..aebbdae7db804b62bf710884b657f0984f26d282 100644 (file)
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -59,9 +59,9 @@
 #include "header.h"
 #include "mbyte.h"
 #include "mutt_regex.h"
-#include "mutt_tags.h"
 #include "parameter.h"
 #include "protos.h"
+#include "tags.h"
 
 static unsigned int hcachever = 0x0;
 

diff --git a/hdrline.c b/hdrline.c
index 4be904b7834afd6c268aef4e922c5c6302893cfc..e968214160ae38fa3c451d4581d730ee8474f71f 100644 (file)
--- a/hdrline.c
+++ b/hdrline.c
@@ -42,11 +42,11 @@
 #include "mbtable.h"
 #include "mutt_curses.h"
 #include "mutt_idna.h"
-#include "mutt_tags.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "protos.h"
 #include "sort.h"
+#include "tags.h"
 #include "thread.h"
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"

diff --git a/header.h b/header.h
index 0db5c054b6cc6d294f32d0d35ea02a99f8fa36cc..8465ac806c75efdbb22c97c677a482456953c552 100644 (file)
--- a/header.h
+++ b/header.h
@@ -27,7 +27,7 @@
 #include <stdbool.h>
 #include <time.h>
 #include "mutt/mutt.h"
-#include "mutt_tags.h"
+#include "tags.h"
 
 /**
  * struct Header - The header/envelope of an email

diff --git a/imap/imap.c b/imap/imap.c
index 6107b82295a4658f6dad0c6bb952b31c7bdf3614..9f251ddc795daae0292d0297f6cd214ee19efb45 100644 (file)
--- a/imap/imap.c
+++ b/imap/imap.c
@@ -97,12 +97,12 @@
 #include "mutt_account.h"
 #include "mutt_curses.h"
 #include "mutt_socket.h"
-#include "mutt_tags.h"
 #include "mx.h"
 #include "options.h"
 #include "pattern.h"
 #include "protos.h"
 #include "sort.h"
+#include "tags.h"
 #include "url.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"

diff --git a/imap/message.c b/imap/message.c
index b7741328f1714f1ea6ce8c909bcc86929c0eed81..22eb362135f34154079d82d9b0b5d84828144ebb 100644 (file)
--- a/imap/message.c
+++ b/imap/message.c
@@ -63,10 +63,10 @@
 #include "mutt_account.h"
 #include "mutt_curses.h"
 #include "mutt_socket.h"
-#include "mutt_tags.h"
 #include "mx.h"
 #include "options.h"
 #include "protos.h"
+#include "tags.h"
 #ifdef USE_HCACHE
 #include "hcache/hcache.h"
 #endif

diff --git a/init.h b/init.h
index 58b838a58a7b7396d4406e93c9c03d9c70021e52..0122fd0aa43f786fd359688c44ba0105952ded40 100644 (file)
--- a/init.h
+++ b/init.h
@@ -41,6 +41,7 @@
 #include "protos.h"
 #include "sort.h"
 #include "conn/conn.h"
+#include "tags.h"
 #ifdef USE_LUA
 #include "mutt_lua.h"
 #endif

diff --git a/menu.c b/menu.c
index b7ab5c43393d414e1da1aeb58b591237170f9a73..2bece048b12aa6dfe60e07b219d6a4c62a564389 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -43,6 +43,7 @@
 #include "options.h"
 #include "pattern.h"
 #include "protos.h"
+#include "tags.h"
 #ifdef USE_SIDEBAR
 #include "sidebar.h"
 #endif

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index 853da8c1e4aaf37a60683b8a452f2cf2087374f8..f7aeace220b0ca9e9d9c15442f0adad460957304 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -57,9 +57,9 @@
 #include "header.h"
 #include "mailbox.h"
 #include "mutt_curses.h"
-#include "mutt_tags.h"
 #include "mx.h"
 #include "protos.h"
+#include "tags.h"
 #include "thread.h"
 #include "url.h"
 

diff --git a/muttlib.c b/muttlib.c
index 6cbf82eabf0a3d7415f8dc9973a53c4c1b34a107..8ef363a9ae88543b889ea94aec28a693fb38cc20 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -58,7 +58,7 @@
 #include "mime.h"
 #include "mutt_curses.h"
 #include "mutt_regex.h"
-#include "mutt_tags.h"
+#include "tags.h"
 
 #include "mx.h"
 #include "ncrypt/ncrypt.h"

diff --git a/pattern.c b/pattern.c
index 185b2401636dd8fe7c71633eaa08936853926cbc..f718c1a6ac9e5dfef6cac6d04c97f871969baa35 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -62,8 +62,8 @@
 #ifdef USE_IMAP
 #include "imap/imap.h"
 #endif
-#include "mutt_tags.h"
 #include "mx.h"
+#include "tags.h"
 #ifdef USE_NOTMUCH
 #include "mutt_notmuch.h"
 #endif

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 0efd84473f41e3390b8d973d5781c64baed56198..84914a29b31c1a9e73ffcf06ca5dd71a10ae3647 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -89,7 +89,6 @@ mutt_lua.c
 mutt_notmuch.c
 mutt_signal.c
 mutt_socket.c
-mutt_tags.c
 mx.c
 ncrypt/crypt.c
 ncrypt/cryptglue.c
@@ -139,6 +138,7 @@ sort.c
 state.c
 status.c
 system.c
+tags.c
 thread.c
 txt2c.c
 url.c

diff --git a/mutt_tags.c b/tags.c
similarity index 98%
rename from mutt_tags.c
rename to tags.c
index 873b57933b5885d33e29ecb93a2a00d3165f7a00..10a464a79070835c5250883c6589ddd370357449 100644 (file)
--- a/mutt_tags.c
+++ b/tags.c
@@ -20,14 +20,16 @@
  * this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stddef.h>
-
 #include "config.h"
+#include <stddef.h>
 #include "mutt/hash.h"
 #include "mutt/queue.h"
 #include "mutt/string2.h"
+#include "tags.h"
 #include "globals.h"
-#include "mutt_tags.h"
+
+char *HiddenTags;
+struct Hash *TagTransforms;
 
 /**
  * driver_tags_free - Free tags from a header

diff --git a/mutt_tags.h b/tags.h
similarity index 96%
rename from mutt_tags.h
rename to tags.h
index cca9f811c21a216d89d02467dfdf31434e0e55b2..d02613364880ed81bb62c4a26b0d8402e164ae1e 100644 (file)
--- a/mutt_tags.h
+++ b/tags.h
@@ -23,10 +23,13 @@
 #ifndef _MUTT_TAG_H
 #define _MUTT_TAG_H
 
-#include <stdbool.h>
 #include <stddef.h>
+#include <stdbool.h>
 #include "mutt/queue.h"
 
+extern char *HiddenTags;
+extern struct Hash *TagTransforms;
+
 /**
  * struct TagNode - LinkedList Tag Element
  *