Merge branch 'release'

diff --git a/bindings/python-cffi/version.txt b/bindings/python-cffi/version.txt
index fd9620c08c1510d4be7d653d09b499dec0f4eb20..989b29cc323f5dacffba2e29082af6e69efafb82 100644 (file)
--- 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 fc867ea76070d3b3edae9230b8ab8ee4f230f2d0..de104bfa4bc1b569fcc1b02e73c227efe9d37c3e 100644 (file)
--- 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 56f4a1600153517edce62d9094ff37ef1ffb13c1..138501a8fdbff5175d361ac2f82bdea06894c149 100644 (file)
--- 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 0ec66372dec7d2f2e7a0f30eede8db40c86c88d2..368ed6696cc9d69a4a56a1bdb480c014b2faae63 100644 (file)
--- 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 fd9620c08c1510d4be7d653d09b499dec0f4eb20..989b29cc323f5dacffba2e29082af6e69efafb82 100644 (file)
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.32.1
+0.32.2