From: Richard Russon Date: Tue, 28 Nov 2017 21:44:33 +0000 (+0000) Subject: rename mutt_tags to tags X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63b6234c86634ac1f034d43b582941555c36bf70;p=neomutt rename mutt_tags to tags --- diff --git a/Makefile.am b/Makefile.am index 1c729b69e..e0bdbb4fe 100644 --- 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 a2d9f8601..2d108c684 100644 --- 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 33767954c..92116c9de 100644 --- 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 4dc126049..5fab20405 100644 --- 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 diff --git a/globals.h b/globals.h index 27395e655..584285b85 100644 --- 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 19d7d3ef6..aebbdae7d 100644 --- 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 4be904b78..e96821416 100644 --- 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 0db5c054b..8465ac806 100644 --- a/header.h +++ b/header.h @@ -27,7 +27,7 @@ #include #include #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 6107b8229..9f251ddc7 100644 --- 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 b7741328f..22eb36213 100644 --- 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 58b838a58..0122fd0aa 100644 --- 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 b7ab5c433..2bece048b 100644 --- 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 853da8c1e..f7aeace22 100644 --- 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 6cbf82eab..8ef363a9a 100644 --- 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 185b24016..f718c1a6a 100644 --- 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 0efd84473..84914a29b 100644 --- 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 873b57933..10a464a79 100644 --- a/mutt_tags.c +++ b/tags.c @@ -20,14 +20,16 @@ * this program. If not, see . */ -#include - #include "config.h" +#include #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 cca9f811c..d02613364 100644 --- a/mutt_tags.h +++ b/tags.h @@ -23,10 +23,13 @@ #ifndef _MUTT_TAG_H #define _MUTT_TAG_H -#include #include +#include #include "mutt/queue.h" +extern char *HiddenTags; +extern struct Hash *TagTransforms; + /** * struct TagNode - LinkedList Tag Element *