From: David Bremner Date: Sat, 22 Oct 2016 15:44:39 +0000 (-0300) Subject: Merge in test-suite, docstring fixes, release prep X-Git-Tag: 0.24_rc0~110 X-Git-Url: https://git.notmuchmail.org/git?a=commitdiff_plain;h=d93e9cee13ef22c5dbba44f33357fd969b8ef88f;hp=9dea5b8804a43d27f8edb452957ec44b77bd155c;p=notmuch Merge in test-suite, docstring fixes, release prep --- diff --git a/NEWS b/NEWS index ac3ceb10..547b961c 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,15 @@ Require Xapian >= 1.2.6 Emacs ----- +Fix default colours for unread and flagged messages + + In 0.23 the default colours for unread and flagged messages in + search view were accidentally swapped. This release returns them to + the original colours. + + A related change in 0.23 broke the customize widget for + notmuch-search-line-faces. This is now fixed. + Fix test failure with Emacs 25.1 A previously undiscovered jit-lock related bug was exposed by Emacs diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index b6cd0729..4bbe0cdc 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.23' +__VERSION__ = '0.23.1' SOVERSION = '4' diff --git a/debian/changelog b/debian/changelog index 1c67e864..361955c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +notmuch (0.23.1-1) UNRELEASED; urgency=medium + + * New upstream bugfix release + * Fix test suite for Emacs 25.1 + * Fix some Emacs customization regressions introduced in 0.23 + * Bug fix: "testsuite fails with TERM=unknown", thanks to Gianfranco + Costamagna (Closes: #841319). + + -- David Bremner Sat, 22 Oct 2016 12:37:49 -0300 + notmuch (0.23-2) unstable; urgency=medium * upload to unstable diff --git a/emacs/notmuch-maildir-fcc.el b/emacs/notmuch-maildir-fcc.el index 95e56503..ea75bb9e 100644 --- a/emacs/notmuch-maildir-fcc.el +++ b/emacs/notmuch-maildir-fcc.el @@ -54,7 +54,10 @@ If `notmuch-maildir-use-notmuch-insert' is set (the default) then the header should be of the form \"folder +tag1 -tag2\" where folder is the folder (relative to the notmuch mailstore) to store the message in, and tag1 and tag2 are tag changes to apply to the -stored message. +stored message. This string is split using `split-string-and-unquote', +so a folder name containing spaces can be specified by +quoting each space with an immediately preceding backslash +or surrounding the entire folder name in double quotes. If `notmuch-maildir-use-notmuch-insert' is nil then the Fcc header should be the directory where the message should be @@ -230,8 +233,12 @@ should be a list of tag changes to apply to the inserted message." The fcc-header should be of the form \"folder +tag1 -tag2\" where folder is the folder (relative to the notmuch mailstore) to store the message in, and tag1 and tag2 are tag changes to apply to the -stored message. If CREATE is non-nil then create the folder if -necessary." +stored message. This string is split using `split-string-and-unquote', +so a folder name containing spaces can be specified by +quoting each space with an immediately preceding backslash +or surrounding the entire folder name in double quotes. + +If CREATE is non-nil then create the folder if necessary." (let* ((args (split-string-and-unquote fcc-header)) (folder (car args)) (tags (cdr args))) diff --git a/test/test-lib.sh b/test/test-lib.sh index bda8a80a..e7b83392 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -55,9 +55,15 @@ export PS4='+(${BASH_SOURCE}:${LINENO}): ${FUNCNAME[0]:+${FUNCNAME[0]}(): }' # Keep the original TERM for say_color and test_emacs ORIGINAL_TERM=$TERM -# dtach(1) provides more capable terminal environment to anything -# that requires more than dumb terminal... -[ x"${TERM:-dumb}" = xdumb ] && DTACH_TERM=vt100 || DTACH_TERM=$TERM +# Set SMART_TERM to vt100 for known dumb/unknown terminal. +# Otherwise use whatever TERM is currently used so that +# users' actual TERM environments are being used in tests. +case ${TERM-} in + '' | dumb | unknown ) + SMART_TERM=vt100 ;; + *) + SMART_TERM=$TERM ;; +esac # For repeatability, reset the environment to known value. LANG=C @@ -1168,10 +1174,10 @@ test_emacs () { fi server_name="notmuch-test-suite-$$" # start a detached session with an emacs server - # user's TERM (or 'vt100' in case user's TERM is unset, empty - # or 'dumb') is given to dtach which assumes a minimally + # user's TERM (or 'vt100' in case user's TERM is known dumb + # or unknown) is given to dtach which assumes a minimally # VT100-compatible terminal -- and emacs inherits that - TERM=$DTACH_TERM dtach -n "$TEST_TMPDIR/emacs-dtach-socket.$$" \ + TERM=$SMART_TERM dtach -n "$TEST_TMPDIR/emacs-dtach-socket.$$" \ sh -c "stty rows 24 cols 80; exec '$TMP_DIRECTORY/run_emacs' \ --no-window-system \ $load_emacs_tests \ diff --git a/version b/version index 39010d22..610e2872 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.23 +0.23.1