Re: testing moderation #2

2021-08-03 Thread David Bremner
Further moderation testing.

On Sun, 1 Aug 2021 at 21:15, David Bremner  wrote:

> this is a second, and hopefully final test of the moderation mechanism
> (at least for today)
>
> d
>
>
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


Re: emacs: Use of seq-some breaks 'nil' values in notmuch-fcc-dirs

2021-08-03 Thread David Bremner
Toke Høiland-Jørgensen  writes:

> Commit 16b2db0986ce ("emacs: various cosmetic improvements") switched
> over notmuch-fcc-header-setup to use 'seq-some' to parse the
> notmuch-fcc-dirs variables. However, this seems to have broken the use
> of 'nil' values in the list. Specifically, I have notmuch-fcc-dirs set
> to something like:
>
> '(("toke@onemail.alias" . "alias1/Sent +sent -unread")
>   ("toke@another.alias" . nil)
>   (".*" . "Sent +sent -unread"))
>
> and since that update, I end up with "Sent +sent -unread" as the FCC
> value for emails I initiate from toke@another.alias.

On the one hand that behaviour was undocumented. On the other hand, it
does seem like a useful thing to want to do. Hopefully Jonas can more
quickly untangle what happened there than I can.

d
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


Re: emacs: honoring notmuch-show-insert-part-text/html for 'w3m renderer

2021-08-03 Thread Jose Antonio Ortega Ruiz
On Tue, Aug 03 2021, David Bremner wrote:

> can someone (TM) make a patch I can apply with git-am?

sent: 20210804000241.1053748-1-...@gnu.org
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


Re: [PATCH] emacs: honour notmuch-show-text/html-blocked-images in w3m messages

2021-08-03 Thread David Bremner
jao  writes:

> When mm-text-html-renderer is set to 'w3m, the variable playing the
> role of a regular expression for blocked images is
> w3m-ignored-image-url-regexp.  We bind it when the renderer is not
> 'shr.
> ---
applied to master
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


[PATCH] emacs: honour notmuch-show-text/html-blocked-images in w3m messages

2021-08-03 Thread jao
When mm-text-html-renderer is set to 'w3m, the variable playing the
role of a regular expression for blocked images is
w3m-ignored-image-url-regexp.  We bind it when the renderer is not
'shr.
---
 emacs/notmuch-show.el | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 9a95eb34..0f96c4fe 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -59,6 +59,7 @@
 (defvar shr-blocked-images)
 (defvar gnus-blocked-images)
 (defvar shr-content-function)
+(defvar w3m-ignored-image-url-regexp)
 
 ;;; Options
 
@@ -823,7 +824,8 @@ will return nil if the CID is unknown or cannot be 
retrieved."
 (let ((mm-inline-text-html-with-w3m-keymap nil)
  ;; FIXME: If we block an image, offer a button to load external
  ;; images.
- (gnus-blocked-images notmuch-show-text/html-blocked-images))
+ (gnus-blocked-images notmuch-show-text/html-blocked-images)
+ (w3m-ignored-image-url-regexp notmuch-show-text/html-blocked-images))
   (notmuch-show-insert-part-*/* msg part content-type nth depth button
 
 ;;; Functions used by notmuch-show--insert-part-text/html-shr
-- 
2.32.0
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


Re: [PATCH] test: aggregate-results updates

2021-08-03 Thread David Bremner
Tomi Ollila  writes:

> On Mon, Aug 02 2021, David Bremner wrote:
>
>> Tomi Ollila  writes:
>>
>>> -   mkdir -p "$test_results_dir"
>>> +   test -d "$test_results_dir" || mkdir "$test_results_dir"
>>
>> Lately I've notice some complaints during parallel test running
>>
>>  mkdir: cannot create directory 
>> '/home/bremner/software/upstream/notmuch/test/test-results': File exists
>>
>> It seems like this change might be the culprit. Can you explain why it
>> was needed?
>
> ah, parallel test non-atomicity is the problem; fix would be to restore -p to 
> mkdir
> (so it does not fail when another program executed mkdir between that test
> check and mkdir execution)
>

Switched back to mkdir -p here, the occasional test failure is worse
than the potential slowdown.

d
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


Re: [PATCH] Fix author-scan.sh on BSD systems.

2021-08-03 Thread David Bremner
Matt Armstrong  writes:

> BSD xargs does not have the -d option. Here we use tr to convert
> newlines to NUL characters, then pass -0 to xargs (which BSD does
> support).
>
> I looked at passing -z to 'git ls-files', but I did not find a BSD
> grep option to turn on NUL deliminted line processing.

Applied to master.

d
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


Re: [PATCH] doc: drop note about early versions of Xapian

2021-08-03 Thread David Bremner
David Bremner  writes:

> Mathias Beyer [1] points out that this note is redudant since Xapian
> no longer builds with the problematic versions of Xapian.

Applied to master.

d
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


Re: [PATCH] test: use --minversion to detect GNU Parallel.

2021-08-03 Thread David Bremner
David Bremner  writes:

> Based on a suggestion of Ole Tange [1].
>

amended per Tomi's suggestions, and applied.
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


Re: [PATCH v2] ruby: cleanup object_destroy()

2021-08-03 Thread David Bremner
Felipe Contreras  writes:
> ---
>
> Rebased on top of latest master.

Thanks. Applied to master.
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


Re: emacs: honoring notmuch-show-insert-part-text/html for 'w3m renderer

2021-08-03 Thread David Bremner
David Edmondson  writes:

> On Saturday, 2021-07-31 at 00:18:45 +01, Jose Antonio Ortega Ruiz wrote:
>
>> Hi,
>>
>> notmuch-show-insert-part-text/html correctly binds shr-blocked-images to
>> notmuch-show-text/html-blocked-images when using 'shr as the
>> mm-text-html-renderer.  However, when the latter is not shr, the
>> function only binds gnus-blocked-images, which is not used by the 'w3m
>> rendered.  The corresponding variable to bind is in the latter case
>> w3m-ignored-image-url-regexp, and something like the simple patch below
>> seem to make things work, at least for me.
>
> Patch looks good.
>
> Reviewed-by: David Edmondson 

can someone (TM) make a patch I can apply with git-am?

thanks,

d
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


[PATCH v2] ruby: cleanup object_destroy()

2021-08-03 Thread Felipe Contreras
It was assumed the destructor of notmuch_rb_database_type did return a
notmuch_status_t because that's what notmuch_database_close returns, and
that value was checked by notmuch_rb_database_close in order to decide
if to raise an exception.

It turns out notmuch_database_destroy was called instead, so nothing was
returned (void).

All the destroy functions are void, and that's what we want.

Signed-off-by: Felipe Contreras 
---

Rebased on top of latest master.

 bindings/ruby/defs.h | 7 ++-
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/bindings/ruby/defs.h b/bindings/ruby/defs.h
index a33ef0da..e2541e8f 100644
--- a/bindings/ruby/defs.h
+++ b/bindings/ruby/defs.h
@@ -136,20 +136,17 @@ notmuch_rb_object_free (void *rb_wrapper)
 talloc_free (rb_wrapper);
 }
 
-static inline notmuch_status_t
+static inline void
 notmuch_rb_object_destroy (VALUE rb_object, const rb_data_type_t *type)
 {
 notmuch_rb_object_t *rb_wrapper;
-notmuch_status_t ret;
 
 Data_Get_Notmuch_Rb_Object (rb_object, type, rb_wrapper);
 
 /* Call the corresponding notmuch_*_destroy function */
-ret = ((notmuch_status_t (*)(void *)) type->data) (rb_wrapper->nm_object);
+((void (*)(void *)) type->data) (rb_wrapper->nm_object);
 notmuch_rb_object_free (rb_wrapper);
 DATA_PTR (rb_object) = NULL;
-
-return ret;
 }
 
 /* status.c */
-- 
2.32.0.40.gb9b36f9b52
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org


Re: [PATCH] test: use --minversion to detect GNU Parallel.

2021-08-03 Thread Tomi Ollila
On Mon, Aug 02 2021, David Bremner wrote:

> Based on a suggestion of Ole Tange [1].
>
> [1]: id:CA+4vN7x6jp4HCiEybZ=5g+2X6Pa7etBFX3Bbd=uyty37gr6...@mail.gmail.com
> ---
>  test/notmuch-test | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/test/notmuch-test b/test/notmuch-test
> index ce142f7c..eefdf091 100755
> --- a/test/notmuch-test
> +++ b/test/notmuch-test
> @@ -51,7 +51,7 @@ RES=0
>  # Run the tests
>  if test -z "${NOTMUCH_TEST_SERIALIZE-}" && command -v parallel >/dev/null ; 
> then
>  test -t 1 && export COLORS_WITHOUT_TTY=t || :
> -if parallel --version 2>&1 | grep -q GNU ; then
> +if parallel --minversion 0 1>/dev/null 2>&1  ; then

fix the 2 spaces ;D

the 1 before >/dev/null is a bit confusing, fast reader reads parallel 
--minversion 0 1
as the arguments. so I'd suggest to drop the '1'.

Tomi


>  echo "INFO: running tests with GNU parallel"
>  printf '%s\n' $TESTS | $TEST_TIMEOUT_CMD parallel || RES=$?
>  else
> -- 
> 2.30.2
> ___
> notmuch mailing list -- notmuch@notmuchmail.org
> To unsubscribe send an email to notmuch-le...@notmuchmail.org
___
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-le...@notmuchmail.org