11 years agoconfigure: Look for both Xapian 1.1 and 1.0 and allow user override.
Carl Worth [Sun, 13 Dec 2009 23:17:35 +0000 (15:17 -0800)]
configure: Look for both Xapian 1.1 and 1.0 and allow user override.

The in-development version of Xapian provides a config program named
xapian-config-1.1 while the released version provides a program named
xapian-config instead. By default, we now try each of these in turn,
and we also allow the user to set a XAPIAN_CONFIG environment variable
to explicitly specify a particular program.

11 years agoemacs: Add instructions to the hidden citations/signatures.
Carl Worth [Fri, 11 Dec 2009 23:52:40 +0000 (15:52 -0800)]
emacs: Add instructions to the hidden citations/signatures.

We've received a user report that the hidden citations were annoying
since the user couldn't tell what was being referred to by subsequent
text. Apparently it wasn't obvious enough that the hidden citation
could be revealed by clicking or by pressing Enter. So make the button
text say as much.

11 years agoemacs: Don't insert extra line after citations.
Carl Worth [Fri, 11 Dec 2009 23:36:41 +0000 (15:36 -0800)]
emacs: Don't insert extra line after citations.

This extra line had been annoying me for a while, so I'm glad to see
it go away.

11 years agoemacs: Don't regard a manually indented '>' as introducing a citation.
Carl Worth [Fri, 11 Dec 2009 23:31:10 +0000 (15:31 -0800)]
emacs: Don't regard a manually indented '>' as introducing a citation.

In the message mentioned in the previous commit, an ASCII diagram was
included in which '>' was used as the first non-whitespace character
in a line. Notmuch previously (and mistakenly) regarded this as a

We fix this by only regarding a '>' in the first column of an email as
introducing a citation.

11 years agoemacs: Avoid infinite loop when marking up citations.
Carl Worth [Fri, 11 Dec 2009 23:25:55 +0000 (15:25 -0800)]
emacs: Avoid infinite loop when marking up citations.

Thanks to Dirk Hohndel for reporting the bug. The infinite loop was first
noticed in the following message (available from the Linux kernel mailing list):


Note that the bug does not show up when viewing the message in
isolation---the bug was triggered only when viewing this file indented
to a depth of at least 13.

The fix is simply to use a marker rather than an integer position when
recording a point we plan to move back to later, (since inserting the
indented button causes the buffer position of the desired marker to

11 years agoExpand scope of items considered when saving attachments
Keith Amidon [Sat, 5 Dec 2009 22:53:59 +0000 (14:53 -0800)]
Expand scope of items considered when saving attachments

Previously only mime parts that indicated specified a "disposition" of
"attachment" were saved.  However there are time when it is important
to be able to save inline content as well.  After this commit any mime
part that specifies a filename will be considered when saving

11 years agoemacs: Fix '+' and '-' in case of thread no longer matching current search.
Carl Worth [Thu, 10 Dec 2009 18:35:18 +0000 (10:35 -0800)]
emacs: Fix '+' and '-' in case of thread no longer matching current search.

Similar to the way thread-viewing was broken after a thread was
archived, (and recently fixed), tag manipulation has also been broken
when the thread no longer matches the current search.

This also means that the behavior of '+' and '-' are now different
than that of '*'. The '+' and '-' bindings now return to the previous
behavior old affecting all messages in the thread, (and not simply
those matching the search).

I actually prefer this behavior, since otherwise a '-' operation on a
thread might not actually remove the tag from the thread, (since it
could operate on a subset of the thread and not hit all messages with
the given tag).

So I'd now like to fix '*' to be consistent with '+' and '-', for
which we add an item to TODO.

11 years agonotmuch.el: patch notmuch-show to call notmuch show without query-context (i.e. witho...
David Bremner [Thu, 10 Dec 2009 15:14:35 +0000 (11:14 -0400)]
notmuch.el: patch notmuch-show to call notmuch show without query-context (i.e. without tag:inbox) if the first query returns nothing.

This fixes the annoying bug of archiving a thread, and then going back
to open it and getting an error.  It needs the notmuch-show API
changing patch of

11 years agonotmuch-show: add optional argument for query context instead of using global binding...
David Bremner [Sat, 5 Dec 2009 02:26:37 +0000 (22:26 -0400)]
notmuch-show: add optional argument for query context instead of using global binding notmuch-search-query-string

Also modify the one call to notmuch-show in notmuch.el.  This makes
the call (notmuch-show thread-id) will work when there is no binding
for notmuch-search-query-string; e.g. when called from user code
outside notmuch.

11 years agonotmuch-search-process-filter: add text properties for authors and subject to each...
David Bremner [Sat, 5 Dec 2009 02:26:36 +0000 (22:26 -0400)]
notmuch-search-process-filter: add text properties for authors and subject to each line

Add functions notmuch-search-find-authors and notmuch-find-subject to
match notmuch-find-thread-id.  These functions are just a wrapper
around get-text-property, but in principle that could change.

11 years agoTODO: Add idea for an --exclude-threads options to "notmuch search".
Carl Worth [Wed, 9 Dec 2009 22:03:03 +0000 (14:03 -0800)]
TODO: Add idea for an --exclude-threads options to "notmuch search".

This would provide support for "muted" threads, as well as allowing for negative
filtering based on messages not matched by the original search, (but present in
threads that do have at least one matched message).

11 years agoNuke the remainings of _notmuch_message_add_thread_id.
Fernando Carrijo [Wed, 9 Dec 2009 19:09:01 +0000 (17:09 -0200)]
Nuke the remainings of _notmuch_message_add_thread_id.

The function _notmuch_message_add_thread_id has been removed
from the private interface of notmuch. There's no reason for
one to keep a declaration of its prototype in the code base.
Also, lets update a commentary that referenced that function
and escaped from previous scrutiny.

Signed-off-by: Fernando Carrijo <>
11 years agoTODO: Note that we should report when two "copies" of a message differ.
Carl Worth [Wed, 9 Dec 2009 06:12:43 +0000 (22:12 -0800)]
TODO: Note that we should report when two "copies" of a message differ.

Marten Veldthuis pointed out on the mailing list that intentional
spoofing is something that the user should be told about.

11 years agoRevert "Add some very rudimentary support for handling html parts"
Carl Worth [Mon, 7 Dec 2009 17:34:06 +0000 (09:34 -0800)]
Revert "Add some very rudimentary support for handling html parts"

This reverts commit ed16edc94d6a50ca86ff1575d9ea6fb9168b2e81.

The performance hit is just far too severe, (threads with many HTML
messages make emacs stop and pause for seconds before displaying the
thread even if most of the HTML messages are entirely hidden).

11 years agofix Makefile.local to install bash completion definitions as not executable
Jameson Graef Rollins [Sat, 28 Nov 2009 23:57:37 +0000 (18:57 -0500)]
fix Makefile.local to install bash completion definitions as not executable

11 years agoMakefile: Mention "./configure --help" now that it exists.
Carl Worth [Sat, 5 Dec 2009 00:09:40 +0000 (16:09 -0800)]
Makefile: Mention "./configure --help" now that it exists.

Since we're directing the user to ./confgiure for more options,
actually tell the user how to discover what those options are.

11 years agoconfigure: Implement a --help option to document --prefix.
Carl Worth [Sat, 5 Dec 2009 00:05:12 +0000 (16:05 -0800)]
configure: Implement a --help option to document --prefix.

Also document that values for CC, CFLAGS, etc. can be specified
via environment variables.

11 years agoMakefile: Silence compiler errors during dependency generation.
Carl Worth [Fri, 4 Dec 2009 23:37:39 +0000 (15:37 -0800)]
Makefile: Silence compiler errors during dependency generation.

We have a bootstrapping issue with our dependency generation. When the
Makefile.config doesn't exist yet, the complete compilation flags are
not yet available for passing to the compiler to generate the

But we don't have explicit rules to create these dependency files,
(just the implicit rule that is created by the -include), so we can't
control when make will attempt to create them.

We do have a dependency of the dependency files on Makefile.config, so
make should eventually call the compiler with the correct flags and
everything should be good. So in the meantime, silence any complaints.

11 years agoMakefile: Inform user that they might want to call ./configure explicitly.
Carl Worth [Fri, 4 Dec 2009 23:32:05 +0000 (15:32 -0800)]
Makefile: Inform user that they might want to call ./configure explicitly.

If the Makefile does this for the user, then no arguments are passed. So
it's only polite to let the user know that it's possible to get pass those

11 years agoconfigure: Support the capturing of CFLAGS and CXXFLAGS at configure time.
Carl Worth [Fri, 4 Dec 2009 23:20:12 +0000 (15:20 -0800)]
configure: Support the capturing of CFLAGS and CXXFLAGS at configure time.

These variables can now be set via configure time via environment
variables like so:

CFLAGS=-g ./configure

and subsequent builds will remember these values. The values can
still be overridden at compile time by passing make variables:

      make CFLAGS=-O2

The CXXFLAGS variable is optional. If unset at either configure
time or at compile time, it will inherit its value from the
CFLAGS variable. (Though if explicitly set at configure time
it must be explicitly overriden at compile time---just overriding
CFLAGS will not override CXXFLAGS as well.)

11 years agoFix quiet compilation to print the user's CFLAGS, CXXFLAGS, LDFLAGS.
Carl Worth [Fri, 4 Dec 2009 23:08:37 +0000 (15:08 -0800)]
Fix quiet compilation to print the user's CFLAGS, CXXFLAGS, LDFLAGS.

The only reason I ever call "make V=1" myself, (other than when
debugging the compiler command-line for some reason), is to ensure
whether my CFLAGS, (like "-g -O0" or "-O2"), are actually making it to
the command-line.

But these are hard to find in the V=1 output, and really, we should
just print these even in the quiet case. So do that.

11 years agoTODO: Note about adding "notmuch search --matching"
Carl Worth [Fri, 4 Dec 2009 22:52:32 +0000 (14:52 -0800)]
TODO: Note about adding "notmuch search --matching"

This bug was recently discussed on the mailing list:

so note one idea for fixing it.

11 years agoFix option parsing for the case of a value with '='.
Carl Worth [Fri, 4 Dec 2009 22:50:49 +0000 (14:50 -0800)]
Fix option parsing for the case of a value with '='.

To support this we need to match the longest-possible suffix and then
strip the shortest-possible prefix.

11 years agoFix configure script to handle --prefix=
Jameson Graef Rollins [Sat, 28 Nov 2009 23:57:35 +0000 (18:57 -0500)]
Fix configure script to handle --prefix=

Reviewed-by: Carl Worth <>:
This is really the fundamental thing that people expect a configure
script to do, so it's important to support it.

11 years ago* notmuch-config: fix small leak from 'g_key_file_to_data'
Dirk-Jan C. Binnema [Wed, 2 Dec 2009 07:11:24 +0000 (09:11 +0200)]
* notmuch-config: fix small leak from 'g_key_file_to_data'

Signed-off-by: Dirk-Jan C. Binnema <>
11 years agoMake search filters handle disjunctive queries.
Jed Brown [Wed, 2 Dec 2009 11:00:35 +0000 (12:00 +0100)]
Make search filters handle disjunctive queries.

notmuch-search-filter now accepts an arbitrary query and will group if
necessary so that we get

  tag:inbox AND (gravy OR biscuits)

instead of the former

  tag:inbox AND gravy OR biscuits

Signed-off-by: Jed Brown <>
11 years agoRemove unused notmuch_parse_date function prototype.
Jeffrey C. Ollie [Sat, 28 Nov 2009 20:11:16 +0000 (14:11 -0600)]
Remove unused notmuch_parse_date function prototype.

notmuch_parse_date is not implemented, so remove the unused function

Signed-off-by: Jeffrey C. Ollie <>
11 years agoconfigure: Tweak the working of the example commands slightly.
Carl Worth [Fri, 4 Dec 2009 00:52:18 +0000 (16:52 -0800)]
configure: Tweak the working of the example commands slightly.

Basically just getting better parallelism between the descriptions of
the Defora and Debian commands. (And fixing a nearby typo.)

11 years agoAdd some text to configure on how to install dependencies with yum.
Jeffrey C. Ollie [Sat, 28 Nov 2009 14:20:08 +0000 (08:20 -0600)]
Add some text to configure on how to install dependencies with yum.

Add some text on how to install dependencies with yum for Fedora or
other systems that use yum for package management.  Since the named of
the required packages on Fedora are slightly different from Debian
this will help get new users of notmuch that use Fedora going quicker.

Signed-off-by: Jeffrey C. Ollie <>
11 years agonotmuch-reply: Display reply message part using UTF-8.
Kan-Ru Chen [Sat, 28 Nov 2009 11:58:29 +0000 (19:58 +0800)]
notmuch-reply: Display reply message part using UTF-8.

Pass the message through the charset filter so that we can view
messages wrote in different charset encoding.

Signed-off-by: Kan-Ru Chen <>
11 years agovim: preserve the 'show everything' flag when finding next/prev buffer
Bart Trojanowski [Sat, 28 Nov 2009 02:31:12 +0000 (21:31 -0500)]
vim: preserve the 'show everything' flag when finding next/prev buffer

When show mode is invoked it could be displaying just the matched messages
or everything.  This flag is passed to NM_search_show_thread().  It is then
stored in a buffer variable, b:nm_show_everything, and used for subsequent
calls to NM_search_show_thread() triggered by <Space>, <C-n> and <C-p>.

Signed-off-by: Bart Trojanowski <>
11 years agoemacs: Open only matched (and unread) messages when displaying a thread.
Carl Worth [Thu, 3 Dec 2009 19:38:05 +0000 (11:38 -0800)]
emacs: Open only matched (and unread) messages when displaying a thread.

This is the long-awaited feature that when viewing a thread resulting
from a search, only the messages that actually match the search will
be opened initially (in addition to unread messages).

So now, it's finally useful to tag a single message in a giant thread,
and then do a search later and easily find just the single tagged

11 years agoemacs: Make message-summary button extend to very beginning of message.
Carl Worth [Thu, 3 Dec 2009 19:34:01 +0000 (11:34 -0800)]
emacs: Make message-summary button extend to very beginning of message.

There's no visible change here---we're just making the button extend
through the invisible portions of the message before the
message-summary line. The reason this is important is that it's easy
for the user to position point at the (invisible) `point-min', so we
want to ensure that there's a valid button there.

11 years agoSince we know what these buttons do it seems like the underlines are
Alexander Botero-Lowry [Thu, 3 Dec 2009 18:52:58 +0000 (10:52 -0800)]
Since we know what these buttons do it seems like the underlines are

11 years agoemacs: notmuch-fontify-headers: Remove unneeded progn and indent correctly.
Carl Worth [Thu, 3 Dec 2009 18:39:33 +0000 (10:39 -0800)]
emacs: notmuch-fontify-headers: Remove unneeded progn and indent correctly.

The defun special form doesn't require a progn. And the remainder
of the function was previously indented in a misleading way, (as
if each "if" was always evaluated, rather than each only being
evaluated if all the previous evaluated to nil).

11 years agoemacs: Make message-summary button begin at beginning of line.
Carl Worth [Thu, 3 Dec 2009 18:37:35 +0000 (10:37 -0800)]
emacs: Make message-summary button begin at beginning of line.

Otherwise, RET is unreliable for opening/closing messages when
navigating through messages with 'n' and 'p'.

11 years agoemacs: Highlight message-summary with background-color instead of inverse video.
Carl Worth [Thu, 3 Dec 2009 17:52:43 +0000 (09:52 -0800)]
emacs: Highlight message-summary with background-color instead of inverse video.

Also, do this with a notmuch-message-summary-face variable so that
the user can easily customize the desried effect.

11 years agoemacs: Make the message-summary highlighting extend to end of visible line.
Carl Worth [Thu, 3 Dec 2009 17:48:00 +0000 (09:48 -0800)]
emacs: Make the message-summary highlighting extend to end of visible line.

This will look much nicer than the highlighting terminating at the
end of the summary text.

11 years agoemacs: Fix notmuch-show-next-open-message.
Carl Worth [Thu, 3 Dec 2009 15:37:40 +0000 (07:37 -0800)]
emacs: Fix notmuch-show-next-open-message.

This function was still implemented in terms of the old, global toggle
for visibility of unread messages, (which no longer exists). Fix it to
use the local 'invisibility-spec property on the button controlling
message visibility.

11 years agoTODO, emacs: Correct a few typos.
Carl Worth [Thu, 3 Dec 2009 15:30:26 +0000 (07:30 -0800)]
TODO, emacs: Correct a few typos.

Sometime I'll stop misspelling things so much, honets.

11 years agoTODO: Add some tasks, delete some tasks.
Carl Worth [Thu, 3 Dec 2009 01:18:51 +0000 (17:18 -0800)]
TODO: Add some tasks, delete some tasks.

A new item from IRC discussion, (speeding up "notmuch restore"), as
well as a bug I just hit myself, (content from citations is not being

While here, notce that several items have recently been completed ('?'
now displays documentation, not function names; we have a search
binding from notmush-show-mode; and "notmuch new" responds to SIGINT
by flushing). Finally, the item regarding optimizing chunky searching
is irrelevant since we dropped chunky searching in favor of the much
better streamed searching.

11 years agonotmuch show: Preserve thread-ordering and nesting without --entire-thread
Carl Worth [Thu, 3 Dec 2009 00:05:23 +0000 (16:05 -0800)]
notmuch show: Preserve thread-ordering and nesting without --entire-thread

When "notmuch show" was recently modified to not show an entire thread
by default, it also lost all capability to properly order the messages
in a thread and to print their proper depth. For example, the command:

notmuch show thread:6d5e3e276461188c5778c9f219f63782

had dramatically different output than:

notmuch show --entire-thread thread:6d5e3e276461188c5778c9f219f63782

even though both commands were selecting and displaying the same set
of messages. The first command would diplay them "flat", (all with
depth:0), and in strict date order; while the second command would
display them "nested" (with depth based on threading), and in thread

We now fix "notmuch show" without the --entire-thread option to also
display nested and thread-ordered messages.

If some messages in the thread are not included in the displayed
results, then they are not counted when computing depth values.

11 years agonotmuch.1: Document the new --entire-thread option to "notmuch show".
Carl Worth [Wed, 2 Dec 2009 23:48:34 +0000 (15:48 -0800)]
notmuch.1: Document the new --entire-thread option to "notmuch show".

This was added to "notmuch help" earlier, but not to the man page.
Add it there, and use consistent wording in both places.

11 years agoemacs: Add --entire-thread option to "notmuch show" command line.
Carl Worth [Wed, 2 Dec 2009 22:38:00 +0000 (14:38 -0800)]
emacs: Add --entire-thread option to "notmuch show" command line.

We (plan to) do any hiding of messages from within emacs, so don't
let notmuch hide messages from us.

11 years agovim: use notmuch show --entire-thread
Bart Trojanowski [Sat, 28 Nov 2009 02:49:40 +0000 (21:49 -0500)]
vim: use notmuch show --entire-thread

11 years agonotmuch show: limit display to only matching messages
Bart Trojanowski [Sat, 28 Nov 2009 02:49:39 +0000 (21:49 -0500)]
notmuch show: limit display to only matching messages

This patch changes the default behaviour of notmuch show to display only
messages that match the search expression.  However, --entire-thread
option is provided to display all messages in threads that matched the
search expression.

It is deemed that will be more useful for human users on the command line.
Scripts can be modified to include the --entire-thread option so that they
can display all messages once more.


$ notmuch search subject:git AND thread:23d99d0f364f93e90e15df8b42eddb5b
thread:23d99d0f364f93e90e15df8b42eddb5b      July 31 [4/12] Johan Herland; [RFCv2 00/12] Foreign VCS helper program for CVS repositories (inbox unread)

Note that in this thread 4 out of 12 messages matched.  The default show
behaviour is to show only those messages that match:

$ notmuch show subject:git AND thread:23d99d0f364f93e90e15df8b42eddb5b | grep 'message{' | wc -l

With the --entire-thread option the output will contain all dozen

$ notmuch show --entire-thread subject:git AND thread:23d99d0f364f93e90e15df8b42eddb5b | grep 'message{' | wc -l

Signed-off-by: Bart Trojanowski <>
11 years agoconfigure: Allow user to specify compiler to be used.
Carl Worth [Wed, 2 Dec 2009 02:33:23 +0000 (18:33 -0800)]
configure: Allow user to specify compiler to be used.

The environment variables CC and CXX can be set at configure time to
specify what compiler to use. This compiler will be used for any
configure-time compilation, and will also be recorded in
Makefile.config to be used during the actual build.

The compiler to be used can still be overridden at build time by using
a make variable such as:

make CC=gcc

11 years agoconfigure: Generate more friendly Makefile.config with separated CFLAGS
Carl Worth [Wed, 2 Dec 2009 02:25:17 +0000 (18:25 -0800)]
configure: Generate more friendly Makefile.config with separated CFLAGS

Each dependency now gets its own variable in the resulting
Makefile.config to make it much easier to debug where the various
flags came from in the case of any problems.

11 years agoconfigure: Clarify pkg-config warning now that Makefile does not invoke pkg-config.
Carl Worth [Wed, 2 Dec 2009 02:13:43 +0000 (18:13 -0800)]
configure: Clarify pkg-config warning now that Makefile does not invoke pkg-config.

It's probably a bit more work to use this configure script without
pkg-config, but it's at least possible, (and we could make it even
easier if this becomes an important use case).

11 years agoconfigure: Generate some documentation into Makefile.config.
Carl Worth [Wed, 2 Dec 2009 02:09:47 +0000 (18:09 -0800)]
configure: Generate some documentation into Makefile.config.

It's just not nice to auto-generate a file without helping out the
poor user who gets stuck trying to figure out what went wrong.

11 years agoconfigure: Resolve all pkg-config flags at configure time.
Carl Worth [Wed, 2 Dec 2009 01:56:39 +0000 (17:56 -0800)]
configure: Resolve all pkg-config flags at configure time.

Previously, we were resolving these within the Makefile. This had
the problem that if pkg-config was not present, the Makefile would
still invoke it resulting in ugly errors before the configure script
was even run, (which would finally present a kind error message about
pkg-config not being present).

11 years agoconfigure: Move getlinetest.c down into config/have_getline.c.
Carl Worth [Wed, 2 Dec 2009 00:56:39 +0000 (16:56 -0800)]
configure: Move getlinetest.c down into config/have_getline.c.

This keeps configure-related clutter out of the main directory, and
also gives a more direct correlation between the name of the test and
the feature being tested for.

11 years agogetdelim: Silence a (bogus) compiler warning.
Carl Worth [Wed, 2 Dec 2009 00:46:21 +0000 (16:46 -0800)]
getdelim: Silence a (bogus) compiler warning.

Some compilers complain that result might be used uninitialized in
this function. I believe such compilers simply aren't looking hard
enough, but it's easy enough to silence them.

11 years agoMakefile: Split warnings into two sets (WARN_CFLAGS and WARN_CXXFLAGS)
Carl Worth [Wed, 2 Dec 2009 00:42:50 +0000 (16:42 -0800)]
Makefile: Split warnings into two sets (WARN_CFLAGS and WARN_CXXFLAGS)

Some C++ compilers complain about -Wmissing-declarations not being
valid, so avoid passing it except when compiling a C file.

11 years agoMakefile: Switch from echo to printf for better portability.
Carl Worth [Wed, 2 Dec 2009 00:38:47 +0000 (16:38 -0800)]
Makefile: Switch from echo to printf for better portability.

Some systems have an echo implementation which doesn't know how to
interpret a sequence of "\n". The word is that printf should be much
more portable, so let's try that instead.

11 years agoconfigure: Assimilate new getlinetest into recent configure conventions.
Carl Worth [Wed, 2 Dec 2009 00:00:31 +0000 (16:00 -0800)]
configure: Assimilate new getlinetest into recent configure conventions.

We're now using printf to print what we're checking before we check. We're
also making variables such as HAVE_GETLINE available to both make and to
the C pre-processor.

With this, the local getline implementation is now only compiled if not
available on the system.

11 years agoAdd test to configure script to detect getline
Jeffrey C. Ollie [Mon, 23 Nov 2009 18:14:15 +0000 (12:14 -0600)]
Add test to configure script to detect getline

Add a simple test to the configure script to detect getline.  It's not
important that the test run, just that it compiles and links without
any errors.

Signed-off-by: Jeffrey C. Ollie <>
11 years agoconfigure: Fix valgrind check to take effect, and to work.
Carl Worth [Tue, 1 Dec 2009 23:52:44 +0000 (15:52 -0800)]
configure: Fix valgrind check to take effect, and to work.

We were missing an "override" directive in the assignment of CFLAGS
within Makefile.config so it was actually having no effect. Then, we
were also failing to get the proper include path for valgrind.h so
it wouldn't have worked even it were having effect. Fix both problems.

11 years agoMakefile: Incorporate getline implementation into the build.
Carl Worth [Tue, 1 Dec 2009 23:23:25 +0000 (15:23 -0800)]
Makefile: Incorporate getline implementation into the build.

It's unconditional for a very short time. We expect to soon be
building it only if necessary.

11 years agocompat/getdelim: Silence a warning about mixing of signed/unsigned.
Carl Worth [Tue, 1 Dec 2009 22:12:01 +0000 (14:12 -0800)]
compat/getdelim: Silence a warning about mixing of signed/unsigned.

If the length is ever so large as to overflow, then we'll end up
returning a negative value (which indicates an error anyway).

11 years agocompat: Change includes from config.h to compat.h.
Carl Worth [Tue, 1 Dec 2009 22:09:12 +0000 (14:09 -0800)]
compat: Change includes from config.h to compat.h.

We may switch to using an autoconf-like config.h, but we're not doing
that just yet.

11 years agocompat: Add implementation of getline from gnulib.
Carl Worth [Tue, 1 Dec 2009 22:06:41 +0000 (14:06 -0800)]
compat: Add implementation of getline from gnulib.

These were copied from the gnulib git repository as of:

commit 563c779682040ed4b89c9b4bbe428dcd8157c90a

They come under the GNU GPL v3 (or later) exactly as notmuch is

11 years agoxutil: Implement xstrndup without relying on strndup.
Carl Worth [Tue, 1 Dec 2009 20:51:39 +0000 (12:51 -0800)]
xutil: Implement xstrndup without relying on strndup.

Since we need to do this for portability, (some systems don't have a
strndup function), we might as well do it unconditionally. There's
almost no disadvantage to doing so, and this has the advantages of not
requiring a configure-time check nor having two different
implementations, one of which would often be less tested.

11 years agolib/index: Fix memory leak for email addresses without names.
Carl Worth [Tue, 1 Dec 2009 20:40:13 +0000 (12:40 -0800)]
lib/index: Fix memory leak for email addresses without names.

We carefully noted the fact that we had locally allocated the string
here, but then we neglected to free it. Switch to talloc instead
which makes it easier to get the behavior we want. It's simpler since
we can just call talloc_free unconditionally, without having to track
the state of whether we allocated the storage for name or not.

11 years agoconfigure: Use printf to achieve result of "echo -n".
Carl Worth [Tue, 1 Dec 2009 19:39:30 +0000 (11:39 -0800)]
configure: Use printf to achieve result of "echo -n".

We had avoided using "echo -n" originally for portability concerns,
and instead just printed the same string in both conditions, (and
also printed the string late if any check took long). The word is
that printf is quite portable, so we use that instead.

11 years agoMakefile: Add new "install-bash" target for bash completion support
Carl Worth [Tue, 1 Dec 2009 18:14:00 +0000 (10:14 -0800)]
Makefile: Add new "install-bash" target for bash completion support

It was problematic to have this in "make install" since it would
unconditionally try to install to /etc, (even if a non-privileged user
was attempting an install to a prefix in the user's home directory,
for example).

11 years agoconfigure: Fix pkg-config warning to not refer to non-existent variables.
Carl Worth [Tue, 1 Dec 2009 18:07:14 +0000 (10:07 -0800)]
configure: Fix pkg-config warning to not refer to non-existent variables.

We used to have NOTMUCH_CFLAGS and NOTMUCH_LDFLAGS in the Makefile, but
we don't anymore, so don't refer to them.

11 years agoconfigure: Clean up the introductory message a bit.
Carl Worth [Tue, 1 Dec 2009 16:40:45 +0000 (08:40 -0800)]
configure: Clean up the introductory message a bit.

Eliminate a typo or two, and mention that the user can edit
Makefile.config if necessary.

11 years agoRemove Makefile.config from the repository.
Carl Worth [Tue, 1 Dec 2009 16:34:09 +0000 (08:34 -0800)]
Remove Makefile.config from the repository.

Instead of shipping a default version, we now add a rule to automatically
run configure if necessary to create Makefile.config.

11 years agonotmuch setup: Exit if EOF is encountered at any prompt.
Carl Worth [Tue, 1 Dec 2009 16:06:09 +0000 (08:06 -0800)]
notmuch setup: Exit if EOF is encountered at any prompt.

If the user is explicitly providing EOF, then terminating the program
is the most likely desired thing to do. This also avoids undefined
behavior from continuing with an uninitialized response after ignoring
the return value of getline().

11 years agoAvoid compiler warnings due to ignored write return values
Dirk-Jan C. Binnema [Mon, 23 Nov 2009 06:03:35 +0000 (08:03 +0200)]
Avoid compiler warnings due to ignored write return values

Glibc (at least) provides the warn_unused_result attribute on write,
(if optimizing and _FORTIFY_SOURCE is defined). So we explicitly
ignore the return value in our signal handler, where we couldn't do
anything anyway.

Compile with:


before this commit to see the warning.

11 years agonotmuch.el: Make 'x' and 'X' in show-mode archive the current thread.
Carl Worth [Tue, 1 Dec 2009 07:21:04 +0000 (23:21 -0800)]
notmuch.el: Make 'x' and 'X' in show-mode archive the current thread.

This makes these keys different than 'q' in this mode, (where 'x'
and 'q' are identical in all of the other modes currently).

The idea here is to make it easier to do non-linear reading of messages,
(such as when poking in to read just one or two threads from a search
result that returned many threads).

11 years agonotmuch.el: Use let to avoid assigning to a free variable.
Carl Worth [Tue, 1 Dec 2009 07:14:11 +0000 (23:14 -0800)]
notmuch.el: Use let to avoid assigning to a free variable.

The dynamic scoping of emacs lisp is such that we never want to assign
to any variable unless it's something we've defined with `defvar' or
else something we're using locally via `let'.

11 years agonotmuch.el: Avoid warning about referencing free variable `button'.
Carl Worth [Tue, 1 Dec 2009 07:09:08 +0000 (23:09 -0800)]
notmuch.el: Avoid warning about referencing free variable `button'.

I'm not even sure how the previous code worked at all---it seems
clear it was supposed to be using `cite-button' rather than `button'.

11 years agonotmuch.el: Avoid calling next/previous-line non-interactively.
Carl Worth [Tue, 1 Dec 2009 07:05:32 +0000 (23:05 -0800)]
notmuch.el: Avoid calling next/previous-line non-interactively.

Emacs always complains if we use these from lisp code.

11 years agonotmuch.el: Make notmuch-help use a full-screen window.
Carl Worth [Tue, 1 Dec 2009 07:02:10 +0000 (23:02 -0800)]
notmuch.el: Make notmuch-help use a full-screen window.

Our documentation is long enough that I think it will be more useful
to use an entire window for it (which is easily dismissed with 'q').
This is also kinder for a user not well-initiated with emacs, for
whom the multi-window help can be confusing.

11 years agonotmuch.el: Make documentation of notmuch-search-mode dynamic.
Carl Worth [Tue, 1 Dec 2009 06:47:10 +0000 (22:47 -0800)]
notmuch.el: Make documentation of notmuch-search-mode dynamic.

Previously, we had some hard-coded keybindings mentioned in the
introductory paragraphs of the documentation for notmuch-search-mode.
Now, we take advantage of the substitute-command-keys functionality to
produce the same text by default, but to dynamically generate the
correct text in the face of the user customizing the keybindings.

11 years agonotmuch.el: Clean up documentation of notmuch-folder-mode-map commands.
Carl Worth [Tue, 1 Dec 2009 06:43:14 +0000 (22:43 -0800)]
notmuch.el: Clean up documentation of notmuch-folder-mode-map commands.

Again, ensuring we have standalone first-line documentation strings,
and overriding builtin commands to add our own documentation strings
to them.

11 years agonotmuch.el: Clean up documentation of notmuch-show-mode-map commands.
Carl Worth [Tue, 1 Dec 2009 06:24:05 +0000 (22:24 -0800)]
notmuch.el: Clean up documentation of notmuch-show-mode-map commands.

As we did recently for notmuch-search-mode-map, ensure that the first
line of docuemntation for each command stands alone.

We also take advantage of the substitute-command-keys functionality
within notmuch-help so that the introductory paragraphs can talk
about key bindings by key (rather than function name) in a way that
will always be current even in the face of the user rebinding keys.

11 years agonotmuch.el: Fix notmuch-help to properly display prefixed bindings.
Carl Worth [Tue, 1 Dec 2009 05:46:55 +0000 (21:46 -0800)]
notmuch.el: Fix notmuch-help to properly display prefixed bindings.

Previously, we would do only a single-level traverse of the keymap.
That meant that for a keybinding such as "M-TAB" we would just see
the prefix key ("ESC") and print that it was a keymap---never printing
the TAB nor the documentation for the command it is bound to.

Now, we do the full walk, constructing a proper description of the
full keybdinding with prefix characters, (and converting "ESC" to
"M-" for legibility).

11 years agonotmuch.el: Clean up documentation of notmuch-search-mode-map commands.
Carl Worth [Tue, 1 Dec 2009 00:52:31 +0000 (16:52 -0800)]
notmuch.el: Clean up documentation of notmuch-search-mode-map commands.

Since notmuch-help now displays a single line of documentation from
each of these commands we ensure that the first line stands alone for
each command.

We also override some builtin commands with new commands that don't
behave any differently, but have our own notmuch-specific
documentation, (such as "select next thread" rather than "move point
to next line").

11 years agonotmuch.el: Fix notmuch-search-goto-last-thread.
Carl Worth [Tue, 1 Dec 2009 00:50:52 +0000 (16:50 -0800)]
notmuch.el: Fix notmuch-search-goto-last-thread.

This broke when we switched to filter-based processing of search
results and added the "End of search results" line onto the end. Fix
to skip ignore that line when moving to the last thread.

11 years agonotmuch.el: Fix notmuch-search-scroll-down to go to first thread.
Carl Worth [Tue, 1 Dec 2009 00:48:19 +0000 (16:48 -0800)]
notmuch.el: Fix notmuch-search-scroll-down to go to first thread.

When there's no more to scroll, we want to select the first thread.

This used to work, and I'm not sure when it broke, (perhaps when we
switched from post-process decorating of the search results to
filtering). Fix the calculation to work again.

11 years agonotmuch.el: Don't document mouse actions in notmuch-help.
Carl Worth [Tue, 1 Dec 2009 00:44:05 +0000 (16:44 -0800)]
notmuch.el: Don't document mouse actions in notmuch-help.

The concept behind direct manipulation with mouse clicks is that
documentation shouldn't be necessary, (though my original motivation
here was simply that "<mouse-1>" was exceeding my TAB width.

This does cause a blank line to be added for the mouse binding. This
isn't directly desired, but as long as it's there we put it at a
natural place for a separator.

11 years agonotmuch.el: Reorder notmuch-search-mode keybindings map.
Carl Worth [Tue, 1 Dec 2009 00:02:27 +0000 (16:02 -0800)]
notmuch.el: Reorder notmuch-search-mode keybindings map.

I had originally created this keymap in order from most important to
least important commands. But our new notmuch-help command is
presented with the list in the reverse order. So we reverse the input
so that the user sees the most important commands first.

11 years agonotmuch.el: Implement our own notmuch-help instead of describe-mode.
Carl Worth [Mon, 30 Nov 2009 17:53:38 +0000 (09:53 -0800)]
notmuch.el: Implement our own notmuch-help instead of describe-mode.

This gives somewhat friendlier output for the '?' binding than we had
previously with `describe-mode'. First, we no longer have the various
minor modes cluttering up the output. Second the display of the
binding table uses the first line of documentation for the bound
function rather than the function name.

11 years agonotmuch.el: Add documentation for notmuch-search-show-thread.
Carl Worth [Mon, 30 Nov 2009 17:49:53 +0000 (09:49 -0800)]
notmuch.el: Add documentation for notmuch-search-show-thread.

It's especially unkind to leave interactive functions without

11 years agonotmuch.el: Don't use beginning-of-buffer from elisp program.
Carl Worth [Mon, 30 Nov 2009 17:48:15 +0000 (09:48 -0800)]
notmuch.el: Don't use beginning-of-buffer from elisp program.

This silences a warning when compiling notmuch.el. The documentation
of beginning-of-buffer does say (rather emphatically) that it's not
to be used from lisp programs.

11 years agoDocumentation for notmuch reply --format=(default|headers-only)
Jed Brown [Sat, 28 Nov 2009 17:56:15 +0000 (18:56 +0100)]
Documentation for notmuch reply --format=(default|headers-only)

Signed-off-by: Jed Brown <>
11 years agoMore portable and easier to read regex in notmuch-search-operate-all
Jed Brown [Sat, 28 Nov 2009 19:51:13 +0000 (20:51 +0100)]
More portable and easier to read regex in notmuch-search-operate-all

The former one worked in but not in 23.1.1.

Signed-off-by: Jed Brown <>
Tested-by: Keith Packard <>
11 years agoAvoid bogus internal error reporting duplicate In-Reply-To IDs.
Carl Worth [Sat, 28 Nov 2009 18:01:22 +0000 (10:01 -0800)]
Avoid bogus internal error reporting duplicate In-Reply-To IDs.

This error was tirggered with a debugging build via:


and reported by David Bremner. The actual error is that I'm an
idiot that doesn't know how to use strcmp's return value. Of
course, the strcmp interface scores a negative 7 on Rusty Russell
ranking of bad interfaces:

11 years agoAdjust autoload comments
Keith Amidon [Fri, 27 Nov 2009 13:30:08 +0000 (05:30 -0800)]
Adjust autoload comments

The previous location of autoload comments didn't seem to correspond
with the functions most likely to be the entry points for using
notmuch.  This change adjusts them to match those likely entry points.

11 years agonotmuch.el: Add face support to search mode
Aneesh Kumar K.V [Sat, 28 Nov 2009 06:07:05 +0000 (11:37 +0530)]
notmuch.el: Add face support to search mode

This patch use notmuch-tag-face showing tags in the notmuch-search-mode.

We can selectively highlight each tag by setting notmuch-tag-face-alist as below

(defface notmuch-tag-unread-face
 '((((class color)) (:foreground "goldenrod")))
  "Notmuch search mode face used to highligh tags.")

(defface notmuch-tag-inbox-face
 '((((class color)) (:foreground "red")))
  "Notmuch search mode face used to highligh tags.")

(setq notmuch-tag-face-alist '(("unread" . 'notmuch-tag-unread-face)
       ("inbox" . 'notmuch-tag-inbox-face)))
(require 'notmuch)

Signed-off-by: Aneesh Kumar K.V <>
11 years agoSend mail to notmuch list, not Carl
Alec Berryman [Sat, 28 Nov 2009 06:07:54 +0000 (00:07 -0600)]
Send mail to notmuch list, not Carl

11 years agonotmuch-new: Check for non-fatal errors from stat()
Chris Wilson [Fri, 27 Nov 2009 13:50:11 +0000 (13:50 +0000)]
notmuch-new: Check for non-fatal errors from stat()

Currently we assume that all errors on stat() a dname is fatal (but
continue anyway and report the error at the end). However, some errors
reported by stat() such as a missing file or insufficient privilege,
we can simply ignore and skip the file. For the others, such as a fault
(unlikely!) or out-of-memory, we handle like the other fatal errors by
jumping to the end.

Signed-off-by: Chris Wilson <>
11 years agoKey binding rearrangement for save attachments in show mode
Keith Amidon [Fri, 27 Nov 2009 13:30:15 +0000 (05:30 -0800)]
Key binding rearrangement for save attachments in show mode

The most obvious bindings for save attachments are already taken.  The
existing 'w' binding was bound to view the raw message.  This commit
moves it to 'V' which still seems somewhat mnemonic and uses 'w' for
save (write) attachments.

11 years agoProvide ability to save attachments
Keith Amidon [Fri, 27 Nov 2009 13:30:14 +0000 (05:30 -0800)]
Provide ability to save attachments

Previously the only way to save an attachment was to attempt to view
it and then save it from within the viewer program.

11 years agoForward individual messages using message-forward
Keith Amidon [Fri, 27 Nov 2009 13:30:11 +0000 (05:30 -0800)]
Forward individual messages using message-forward

Sometimes forwarding a message is preferable to replying and modifying
the set of recipients.  This commit provides that ability using the
message-forward function.

11 years agoFactor out message buffer mgmt from notmuch-show-view-all-mime-parts
Keith Amidon [Fri, 27 Nov 2009 13:30:10 +0000 (05:30 -0800)]
Factor out message buffer mgmt from notmuch-show-view-all-mime-parts

The ability to temporarily create a buffer containing only the
contents of the currently selected message in notmuch show mode is
generally useful.  This commit factors the majority of the code
required to do so out of notmuch-show-view-all-mime-parts into a macro
called with-current-notmuch-show-message and rewrites the original
function in terms of the macro.

A future set of commits will provide additional functionality using
the macro as well.

11 years agoAdd key binding for notmuch-search in show-mode
Keith Amidon [Fri, 27 Nov 2009 13:30:09 +0000 (05:30 -0800)]
Add key binding for notmuch-search in show-mode

It's not uncommon to want to start a search as a result of something
read in a message so this is convenient.