diff options
| author | David Bremner <david@tethera.net> | 2021-06-25 09:34:29 -0300 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2021-06-25 09:34:29 -0300 |
| commit | 4b0c6fb2f1ba989fee554cb8fa2612046d6414a8 (patch) | |
| tree | f67f69ee6f694469d0c57b00ba6624045ad85ee0 | |
| parent | ea301102abc55404b8b447cd50998429bfbbf9fd (diff) | |
| parent | 35d559eb18d779822074a0781585642028e61ed8 (diff) | |
Merge branch 'release'
| -rw-r--r-- | bindings/python-cffi/version.txt | 2 | ||||
| -rw-r--r-- | bindings/python/notmuch/version.py | 2 | ||||
| -rw-r--r-- | doc/man1/notmuch-config.rst | 7 | ||||
| -rw-r--r-- | lib/config.cc | 2 | ||||
| -rw-r--r-- | version.txt | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/bindings/python-cffi/version.txt b/bindings/python-cffi/version.txt index fd9620c0..989b29cc 100644 --- a/bindings/python-cffi/version.txt +++ b/bindings/python-cffi/version.txt @@ -1 +1 @@ -0.32.1 +0.32.2 diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index fc867ea7..de104bfa 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,3 +1,3 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.32.1' +__VERSION__ = '0.32.2' SOVERSION = '5' diff --git a/doc/man1/notmuch-config.rst b/doc/man1/notmuch-config.rst index 56f4a160..138501a8 100644 --- a/doc/man1/notmuch-config.rst +++ b/doc/man1/notmuch-config.rst @@ -81,10 +81,13 @@ paths are presumed relative to `$HOME` for items in section `backups`. **database.hook_dir** - Directory containing hooks run by notmuch commands. See :any:`notmuch-hooks(5)`. + History: this configuration value was introduced in notmuch 0.32. + + Default: See HOOKS, below. + **user.name** Your full name. @@ -261,7 +264,7 @@ Notmuch configuration file search order: by :envvar:`NOTMUCH_PROFILE` environment variable if set, ``$HOME/.notmuch-config`` otherwise. -Hooks +HOOKS ----- Notmuch hook directory search order: diff --git a/lib/config.cc b/lib/config.cc index 0ec66372..368ed669 100644 --- a/lib/config.cc +++ b/lib/config.cc @@ -318,7 +318,7 @@ notmuch_config_values_valid (notmuch_config_values_t *values) const char * 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 diff --git a/version.txt b/version.txt index fd9620c0..989b29cc 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.32.1 +0.32.2 |