debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-28 05:34:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'release'

Browse source
This commit is contained in:
David Bremner 2021-06-25 09:34:29 -03:00
commit 4b0c6fb2f1
5 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/python-cffi/version.txt
View file

@ -1 +1 @@
0.32.1 0.32.2

2
bindings/python/notmuch/version.py
View file

@ -1,3 +1,3 @@
# this file should be kept in sync with ../../../version # this file should be kept in sync with ../../../version
__VERSION__ = '0.32.1' __VERSION__ = '0.32.2'
SOVERSION = '5' SOVERSION = '5'

7
doc/man1/notmuch-config.rst
View file

@ -81,10 +81,13 @@ paths are presumed relative to `$HOME` for items in section
`backups`. `backups`.
**database.hook_dir** **database.hook_dir**
Directory containing hooks run by notmuch commands. See Directory containing hooks run by notmuch commands. See
:any:`notmuch-hooks(5)`. :any:`notmuch-hooks(5)`.
History: this configuration value was introduced in notmuch 0.32.
Default: See HOOKS, below.
**user.name** **user.name**
Your full name. Your full name.
@ -261,7 +264,7 @@ Notmuch configuration file search order:
by :envvar:`NOTMUCH_PROFILE` environment variable if set, by :envvar:`NOTMUCH_PROFILE` environment variable if set,
``$HOME/.notmuch-config`` otherwise. ``$HOME/.notmuch-config`` otherwise.
Hooks HOOKS
----- -----
Notmuch hook directory search order: Notmuch hook directory search order:

2
lib/config.cc
View file

@ -318,7 +318,7 @@ notmuch_config_values_valid (notmuch_config_values_t *values)
const char * const char *
notmuch_config_values_get (notmuch_config_values_t *values) notmuch_config_values_get (notmuch_config_values_t *values)
{ {
return talloc_strndup (values, values->iterator, values->tok_len); return talloc_strndup (values->children, values->iterator, values->tok_len);
} }
void void

2
version.txt
View file

@ -1 +1 @@
0.32.1 0.32.2