Move parameter.[ch] to mutt/

diff --git a/Makefile.autosetup b/Makefile.autosetup
index 67154f16a4544c75947679f54144128f9983e42f..1e6e8c8c00517907d27d65bbaace400bab5fa4e9 100644 (file)
--- a/Makefile.autosetup
+++ b/Makefile.autosetup
@@ -62,7 +62,7 @@ NEOMUTTOBJS=  mutt_account.o addrbook.o alias.o attach.o bcache.o body.o \
                header.o help.o history.o hook.o init.o keymap.o main.o \
                mbox.o menu.o mh.o muttlib.o mutt_address.o \
                mutt_socket.o tags.o mx.o \
-               newsrc.o nntp.o pager.o parameter.o parse.o pattern.o pop.o \
+               newsrc.o nntp.o pager.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 \
                safe_asprintf.o score.o send.o sendlib.o sidebar.o mutt_signal.o \
@@ -91,9 +91,12 @@ ALLOBJS+=    $(NEOMUTTOBJS)
 ###############################################################################
 # libmutt
 LIBMUTT=       libmutt.a
-LIBMUTTOBJS=   mutt/base64.o mutt/buffer.o mutt/charset.o mutt/date.o mutt/debug.o mutt/exit.o \
-               mutt/file.o mutt/hash.o mutt/idna.o mutt/list.o mutt/mapping.o mutt/mbyte.o mutt/md5.o \
-               mutt/memory.o mutt/message.o mutt/mime.o mutt/regex.o mutt/sha1.o mutt/signal.o mutt/string.o \
+LIBMUTTOBJS=   mutt/base64.o mutt/buffer.o mutt/charset.o mutt/date.o \
+               mutt/debug.o mutt/exit.o \
+               mutt/file.o mutt/hash.o mutt/idna.o mutt/list.o \
+               mutt/mapping.o mutt/mbyte.o mutt/md5.o \
+               mutt/memory.o mutt/message.o mutt/mime.o mutt/parameter.o \
+               mutt/regex.o mutt/sha1.o mutt/signal.o mutt/string.o \
                mutt/rfc2047.o
 CLEANFILES+=   $(LIBMUTT) $(LIBMUTTOBJS)
 MUTTLIBS+=     $(LIBMUTT)
@@ -270,13 +273,13 @@ git_ver.h: $(ALL_FILES)
 
 hcache/hcversion.h:    $(SRCDIR)/mutt.h $(SRCDIR)/address.h \
                        $(SRCDIR)/mutt/list.h $(SRCDIR)/mutt/buffer.h \
-                       $(SRCDIR)/parameter.h $(SRCDIR)/body.h \
+                       $(SRCDIR)/mutt/parameter.h $(SRCDIR)/body.h \
                        $(SRCDIR)/envelope.h $(SRCDIR)/header.h \
                        $(SRCDIR)/hcache/hcachever.sh \
                        $(PWD)/hcache
        ( echo '#include "config.h"'; echo '#include "mutt.h"'; \
        echo '#include "address.h"'; echo '#include "mutt/list.h"'; \
-       echo '#include "mutt/buffer.h"'; echo '#include "parameter.h"'; \
+       echo '#include "mutt/buffer.h"'; echo '#include "mutt/parameter.h"'; \
        echo '#include "body.h"'; echo '#include "envelope.h"'; \
        echo '#include "header.h"';) | $(CPP) $(CFLAGS) - | \
        sh $(SRCDIR)/hcache/hcachever.sh hcache/hcversion.h

diff --git a/attach.c b/attach.c
index 149dfc67e1efafcdbab839c6339af7706db2dcb4..c0aad8e9541bf055bda9f2bb245fd1f2e5afaf43 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -43,7 +43,6 @@
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "pager.h"
-#include "parameter.h"
 #include "protos.h"
 #include "rfc1524.h"
 #include "state.h"

diff --git a/body.c b/body.c
index 1e5d5850935989d3d91672f5cd7cee385bbe418a..2308d8ea0523ecefe68976950cf7f95b5e71a549 100644 (file)
--- a/body.c
+++ b/body.c
@@ -27,7 +27,6 @@
 #include "mutt/mutt.h"
 #include "body.h"
 #include "header.h"
-#include "parameter.h"
 #include "protos.h"
 
 struct Body *mutt_new_body(void)

diff --git a/commands.c b/commands.c
index ba6ccecab6b22d7810152614b760908b62f2bb33..1168d2b9ad7dd8993d33d77ea95f85f10bb8c52e 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -51,7 +51,6 @@
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "pager.h"
-#include "parameter.h"
 #include "protos.h"
 #include "sort.h"
 #ifdef USE_IMAP

diff --git a/handler.c b/handler.c
index b06bf4bb3052f2d412a7e922daeb157016d45929..da1ee1668452fa5fc07a330d09afa5f4b0043c94 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -45,7 +45,6 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "parameter.h"
 #include "protos.h"
 #include "rfc1524.h"
 #include "rfc3676.h"

diff --git a/hcache/hcache.c b/hcache/hcache.c
index bf8617126a7de413498a76ab1d1bd56b211840cd..5fd98777eea28f0d879ec87ce99f1cf97922d360 100644 (file)
--- a/hcache/hcache.c
+++ b/hcache/hcache.c
@@ -56,7 +56,6 @@
 #include "hcache.h"
 #include "hcache/hcversion.h"
 #include "header.h"
-#include "parameter.h"
 #include "protos.h"
 #include "tags.h"
 

diff --git a/mbox.c b/mbox.c
index 4911da945ecf42d0c516c5a82a7b80a9f73edf12..e00b27b50c052a6e41fb027ff6df7808de543ef8 100644 (file)
--- a/mbox.c
+++ b/mbox.c
@@ -46,7 +46,6 @@
 #include "mutt_curses.h"
 #include "mx.h"
 #include "options.h"
-#include "parameter.h"
 #include "protos.h"
 #include "sort.h"
 #include "thread.h"

diff --git a/mutt/mutt.h b/mutt/mutt.h
index 5d4e5a7e88fb1419f3441d740fa9de01663fd01f..4c9abe47d07ee15be280f4bdcafd26bffa995918 100644 (file)
--- a/mutt/mutt.h
+++ b/mutt/mutt.h
@@ -25,29 +25,30 @@
  *
  * Each source file in the library provides a group of related functions.
  *
- * | File           | Description      |
- * | :------------- | :--------------- |
- * | mutt/base64.c  | @subpage base64  |
- * | mutt/buffer.c  | @subpage buffer  |
- * | mutt/charset.c | @subpage charset |
- * | mutt/date.c    | @subpage date    |
- * | mutt/debug.c   | @subpage debug   |
- * | mutt/exit.c    | @subpage exit    |
- * | mutt/file.c    | @subpage file    |
- * | mutt/hash.c    | @subpage hash    |
- * | mutt/idna.c    | @subpage idna    |
- * | mutt/list.c    | @subpage list    |
- * | mutt/mapping.c | @subpage mapping |
- * | mutt/mbyte.c   | @subpage mbyte   |
- * | mutt/md5.c     | @subpage md5     |
- * | mutt/memory.c  | @subpage memory  |
- * | mutt/message.c | @subpage message |
- * | mutt/mime.c    | @subpage mime    |
- * | mutt/regex.c   | @subpage regex   |
- * | mutt/rfc2047.c | @subpage rfc2047 |
- * | mutt/sha1.c    | @subpage sha1    |
- * | mutt/signal.c  | @subpage signal  |
- * | mutt/string.c  | @subpage string  |
+ * | File             | Description        |
+ * | :--------------- | :----------------- |
+ * | mutt/base64.c    | @subpage base64    |
+ * | mutt/buffer.c    | @subpage buffer    |
+ * | mutt/charset.c   | @subpage charset   |
+ * | mutt/date.c      | @subpage date      |
+ * | mutt/debug.c     | @subpage debug     |
+ * | mutt/exit.c      | @subpage exit      |
+ * | mutt/file.c      | @subpage file      |
+ * | mutt/hash.c      | @subpage hash      |
+ * | mutt/idna.c      | @subpage idna      |
+ * | mutt/list.c      | @subpage list      |
+ * | mutt/mapping.c   | @subpage mapping   |
+ * | mutt/mbyte.c     | @subpage mbyte     |
+ * | mutt/md5.c       | @subpage md5       |
+ * | mutt/memory.c    | @subpage memory    |
+ * | mutt/message.c   | @subpage message   |
+ * | mutt/mime.c      | @subpage mime      |
+ * | mutt/parameter.c | @subpage parameter |
+ * | mutt/regex.c     | @subpage regex     |
+ * | mutt/rfc2047.c   | @subpage rfc2047   |
+ * | mutt/sha1.c      | @subpage sha1      |
+ * | mutt/signal.c    | @subpage signal    |
+ * | mutt/string.c    | @subpage string    |
  *
  * @note The library is self-contained -- some files may depend on others in
  *       the library, but none depends on source from outside.
@@ -72,6 +73,7 @@
 #include "memory.h"
 #include "message.h"
 #include "mime.h"
+#include "parameter.h"
 #include "regex3.h"
 #include "rfc2047.h"
 #include "sha1.h"

diff --git a/parameter.c b/mutt/parameter.c
similarity index 100%
rename from parameter.c
rename to mutt/parameter.c

diff --git a/parameter.h b/mutt/parameter.h
similarity index 100%
rename from parameter.h
rename to mutt/parameter.h

diff --git a/muttlib.c b/muttlib.c
index a412b1eda355c0a8416fb6d8908235d5ae49b5d9..4b8dcebcce08b8a57852ffc87c4e14c676183c48 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -55,7 +55,6 @@
 #include "mx.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
-#include "parameter.h"
 #include "protos.h"
 #include "tags.h"
 #include "url.h"

diff --git a/ncrypt/crypt.c b/ncrypt/crypt.c
index b34baa15789622f1e0eefa1634f33de209f64aed..2e1eefa86e4fecc486fc0a11c4af940817698551 100644 (file)
--- a/ncrypt/crypt.c
+++ b/ncrypt/crypt.c
@@ -47,7 +47,6 @@
 #include "mutt_curses.h"
 #include "ncrypt.h"
 #include "options.h"
-#include "parameter.h"
 #include "protos.h"
 #include "state.h"
 

diff --git a/ncrypt/crypt_gpgme.c b/ncrypt/crypt_gpgme.c
index 7186551e14474376db3751a5c199a6dd1e6f9c60..2bf3b9f20e49627c9ad92d14e3ca469cb15c9c97 100644 (file)
--- a/ncrypt/crypt_gpgme.c
+++ b/ncrypt/crypt_gpgme.c
@@ -59,7 +59,6 @@
 #include "opcodes.h"
 #include "options.h"
 #include "pager.h"
-#include "parameter.h"
 #include "protos.h"
 #include "sort.h"
 #include "state.h"

diff --git a/ncrypt/pgp.c b/ncrypt/pgp.c
index 973a35e2d88a76e6206b9a4966706266007c494a..96dfe77d1725a0cce99b7b3b0514a0fdfae4213a 100644 (file)
--- a/ncrypt/pgp.c
+++ b/ncrypt/pgp.c
@@ -53,7 +53,6 @@
 #include "mutt_curses.h"
 #include "ncrypt.h"
 #include "options.h"
-#include "parameter.h"
 #include "pgpinvoke.h"
 #include "pgplib.h"
 #include "pgpmicalg.h"

diff --git a/ncrypt/smime.c b/ncrypt/smime.c
index cc861adac4a5a42e6781a158b58321fbe1ea4cc5..5b59318280d62b32afe6e7f7c551591c1cd0ac78 100644 (file)
--- a/ncrypt/smime.c
+++ b/ncrypt/smime.c
@@ -49,7 +49,6 @@
 #include "ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "parameter.h"
 #include "protos.h"
 #include "state.h"
 

diff --git a/parse.c b/parse.c
index 96211cd4ebef2baa88e33d3f7a7c483b00ad1ef5..49397e4ae8933536c5f313678bfedf3463bfeebf 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -38,7 +38,6 @@
 #include "mailbox.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
-#include "parameter.h"
 #include "protos.h"
 #include "rfc2047.h"
 #include "rfc2231.h"

diff --git a/postpone.c b/postpone.c
index 4ef981f3ef15137e640efbb6d7e7713c4d9978ba..fceacf1934514d61edae99380a418155c0510270 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -44,7 +44,6 @@
 #include "ncrypt/ncrypt.h"
 #include "opcodes.h"
 #include "options.h"
-#include "parameter.h"
 #include "protos.h"
 #include "sort.h"
 #include "state.h"

diff --git a/rfc1524.c b/rfc1524.c
index b5277f255982bfeede5175886933b0d4caa1bdd6..c1a7ffeaaa1ae1eb5faf62ce50bf86847588af32 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -40,7 +40,6 @@
 #include "body.h"
 #include "globals.h"
 #include "options.h"
-#include "parameter.h"
 #include "protos.h"
 
 /**

diff --git a/rfc2231.c b/rfc2231.c
index b02e952c45ab9c70d7fde3b44f99704bd5b8adac..d5bf7e1239629767ef7dd45fb605eea5584dc1cf 100644 (file)
--- a/rfc2231.c
+++ b/rfc2231.c
@@ -39,8 +39,6 @@
 #include "rfc2231.h"
 #include "globals.h"
 #include "options.h"
-#include "parameter.h"
-#include "rfc2047.h"
 
 /**
  * struct Rfc2231Parameter - MIME section parameter

diff --git a/rfc3676.c b/rfc3676.c
index 9383584947a53c6edb58f2f36831d061468a70ce..5ebc8e6cbd209b84631bcf26347eb02d9ef96842 100644 (file)
--- a/rfc3676.c
+++ b/rfc3676.c
@@ -35,7 +35,6 @@
 #include "header.h"
 #include "mutt_curses.h"
 #include "options.h"
-#include "parameter.h"
 #include "protos.h"
 #include "state.h"
 

diff --git a/send.c b/send.c
index ef37e297447b78061005e48c0bfb262b31035284..3863429b1ae7338c7633d48b80f26ced4e6e1ca7 100644 (file)
--- a/send.c
+++ b/send.c
@@ -46,7 +46,6 @@
 #include "mutt_curses.h"
 #include "ncrypt/ncrypt.h"
 #include "options.h"
-#include "parameter.h"
 #include "pattern.h"
 #include "protos.h"
 #include "rfc2047.h"

diff --git a/sendlib.c b/sendlib.c
index a5f30c5b6ee4a1453a479d0e01cb7c245e99022f..ed4176e5c4c4d3eb62fe132dc86a01aa83f91e2c 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -54,7 +54,6 @@
 #include "ncrypt/ncrypt.h"
 #include "options.h"
 #include "pager.h"
-#include "parameter.h"
 #include "protos.h"
 #include "rfc2047.h"
 #include "rfc2231.h"