From 11473122b74f27b2af6364d2cdac1bf7a4c13280 Mon Sep 17 00:00:00 2001 From: Brendan Cully Date: Tue, 13 Mar 2007 22:40:07 -0700 Subject: Fully expand $docdir when building Muttrc (closes: #2832) --- Makefile.am | 3 +- Muttrc.head | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Muttrc.head.in | 90 ---------------------------------------------------------- configure.in | 1 - 4 files changed, 92 insertions(+), 92 deletions(-) create mode 100644 Muttrc.head delete mode 100644 Muttrc.head.in diff --git a/Makefile.am b/Makefile.am index d299d028..d171977b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -201,8 +201,9 @@ Muttrc: stamp-doc-rc stamp-doc-rc: $(srcdir)/init.h makedoc Muttrc.head -rm -f Muttrc stamp-doc-rc + sed -e 's,[@]docdir[@],$(docdir),' $(srcdir)/Muttrc.head > Muttrc $(CPP) $(AM_CPPFLAGS) $(DEFS) $(CPPFLAGS) -D_MAKEDOC -C \ - $(srcdir)/init.h | ./makedoc -c | cat Muttrc.head - > Muttrc + $(srcdir)/init.h | ./makedoc -c >> Muttrc touch stamp-doc-rc diff --git a/Muttrc.head b/Muttrc.head new file mode 100644 index 00000000..a01449bc --- /dev/null +++ b/Muttrc.head @@ -0,0 +1,90 @@ +# +# System configuration file for Mutt +# + +# default list of header fields to weed when displaying +# +ignore "from " received content- mime-version status x-status message-id +ignore sender references return-path lines + +# imitate the old search-body function +macro index \eb "~b " "search in message bodies" + +# simulate the old url menu +macro index,pager \cb " urlview" "call urlview to extract URLs out of a message" +macro attach,compose \cb " urlview" "call urlview to extract URLs out of a message" + +# Show documentation when pressing F1 +macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" + +# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" +macro index,pager y "?" "show incoming mailboxes list" +bind browser y exit + +# If Mutt is unable to determine your site's domain name correctly, you can +# set the default here. +# +# set hostname=cs.hmc.edu + +# If your sendmail supports the -B8BITMIME flag, enable the following +# +# set use_8bitmime + +## +## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH *** +## + +## +## Please see the manual (section "attachments") for detailed +## documentation of the "attachments" command. +## +## Removing a pattern from a list removes that pattern literally. It +## does not remove any type matching the pattern. +## +## attachments +A */.* +## attachments +A image/jpeg +## unattachments +A */.* +## +## This leaves "attached" image/jpeg files on the allowed attachments +## list. It does not remove all items, as you might expect, because the +## second */.* is not a matching expression at this time. +## +## Remember: "unattachments" only undoes what "attachments" has done! +## It does not trigger any matching on actual messages. + +## Qualify any MIME part with an "attachment" disposition, EXCEPT for +## text/x-vcard and application/pgp parts. (PGP parts are already known +## to mutt, and can be searched for with ~g, ~G, and ~k.) +## +## I've added x-pkcs7 to this, since it functions (for S/MIME) +## analogously to PGP signature attachments. S/MIME isn't supported +## in a stock mutt build, but we can still treat it specially here. +## +attachments +A */.* +attachments -A text/x-vcard application/pgp.* +attachments -A application/x-pkcs7-.* + +## Discount all MIME parts with an "inline" disposition, unless they're +## text/plain. (Why inline a text/plain part unless it's external to the +## message flow?) +## +attachments +I text/plain + +## These two lines make Mutt qualify MIME containers. (So, for example, +## a message/rfc822 forward will count as an attachment.) The first +## line is unnecessary if you already have "attach-allow */.*", of +## course. These are off by default! The MIME elements contained +## within a message/* or multipart/* are still examined, even if the +## containers themseves don't qualify. +## +#attachments +A message/.* multipart/.* +#attachments +I message/.* multipart/.* + +## You probably don't really care to know about deleted attachments. +attachments -A message/external-body +attachments -I message/external-body + +## +## More settings +## + diff --git a/Muttrc.head.in b/Muttrc.head.in deleted file mode 100644 index a01449bc..00000000 --- a/Muttrc.head.in +++ /dev/null @@ -1,90 +0,0 @@ -# -# System configuration file for Mutt -# - -# default list of header fields to weed when displaying -# -ignore "from " received content- mime-version status x-status message-id -ignore sender references return-path lines - -# imitate the old search-body function -macro index \eb "~b " "search in message bodies" - -# simulate the old url menu -macro index,pager \cb " urlview" "call urlview to extract URLs out of a message" -macro attach,compose \cb " urlview" "call urlview to extract URLs out of a message" - -# Show documentation when pressing F1 -macro generic,pager " less @docdir@/manual.txt" "show Mutt documentation" - -# show the incoming mailboxes list (just like "mutt -y") and back when pressing "y" -macro index,pager y "?" "show incoming mailboxes list" -bind browser y exit - -# If Mutt is unable to determine your site's domain name correctly, you can -# set the default here. -# -# set hostname=cs.hmc.edu - -# If your sendmail supports the -B8BITMIME flag, enable the following -# -# set use_8bitmime - -## -## *** DEFAULT SETTINGS FOR THE ATTACHMENTS PATCH *** -## - -## -## Please see the manual (section "attachments") for detailed -## documentation of the "attachments" command. -## -## Removing a pattern from a list removes that pattern literally. It -## does not remove any type matching the pattern. -## -## attachments +A */.* -## attachments +A image/jpeg -## unattachments +A */.* -## -## This leaves "attached" image/jpeg files on the allowed attachments -## list. It does not remove all items, as you might expect, because the -## second */.* is not a matching expression at this time. -## -## Remember: "unattachments" only undoes what "attachments" has done! -## It does not trigger any matching on actual messages. - -## Qualify any MIME part with an "attachment" disposition, EXCEPT for -## text/x-vcard and application/pgp parts. (PGP parts are already known -## to mutt, and can be searched for with ~g, ~G, and ~k.) -## -## I've added x-pkcs7 to this, since it functions (for S/MIME) -## analogously to PGP signature attachments. S/MIME isn't supported -## in a stock mutt build, but we can still treat it specially here. -## -attachments +A */.* -attachments -A text/x-vcard application/pgp.* -attachments -A application/x-pkcs7-.* - -## Discount all MIME parts with an "inline" disposition, unless they're -## text/plain. (Why inline a text/plain part unless it's external to the -## message flow?) -## -attachments +I text/plain - -## These two lines make Mutt qualify MIME containers. (So, for example, -## a message/rfc822 forward will count as an attachment.) The first -## line is unnecessary if you already have "attach-allow */.*", of -## course. These are off by default! The MIME elements contained -## within a message/* or multipart/* are still examined, even if the -## containers themseves don't qualify. -## -#attachments +A message/.* multipart/.* -#attachments +I message/.* multipart/.* - -## You probably don't really care to know about deleted attachments. -attachments -A message/external-body -attachments -I message/external-body - -## -## More settings -## - diff --git a/configure.in b/configure.in index f3b0d400..2cd6b00e 100644 --- a/configure.in +++ b/configure.in @@ -1166,5 +1166,4 @@ AC_OUTPUT(Makefile intl/Makefile m4/Makefile po/Makefile.in doc/Makefile contrib/Makefile muttbug.sh imap/Makefile - Muttrc.head doc/instdoc.sh) -- cgit v1.2.3