Re: [PATCH] emacs/tree: use two argument form of setq-local

2023-02-21 Thread David Bremner
David Bremner  writes:

> Apparently the macro setq-local only takes two arguments in Emacs 26.1
> ---
>  emacs/notmuch-tree.el | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
> index 14775d59..b58fa6a6 100644
> --- a/emacs/notmuch-tree.el
> +++ b/emacs/notmuch-tree.el
> @@ -1451,11 +1451,11 @@ notmuch-tree buffers, just set
>(unless (derived-mode-p 'notmuch-tree-mode)
>  (user-error "notmuch-tree-outline-mode is only meaningful for notmuch 
> trees!"))
>(if notmuch-tree-outline-mode
> -  (progn (setq-local outline-regexp "^[^\n]+"
> -  outline-level #'notmuch-tree-outline--level)
> +  (progn (setq-local outline-regexp "^[^\n]+")
> +  (setq-local outline-level #'notmuch-tree-outline--level)
>(notmuch-tree-outline--set-visibility))
> -(setq-local outline-regexp (default-value 'outline-regexp)
> - outline-level (default-value 'outline-level
> +(setq-local outline-regexp (default-value 'outline-regexp))
> +(setq-local  outline-level (default-value 'outline-level

Applied to master.

d

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


Re: [PATCH] emacs/tree: use two argument form of setq-local

2023-02-21 Thread Michael J Gruber
Am Di., 21. Feb. 2023 um 12:49 Uhr schrieb David Bremner :
>
> Apparently the macro setq-local only takes two arguments in Emacs 26.1
> ---
>  emacs/notmuch-tree.el | 8 
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
> index 14775d59..b58fa6a6 100644
> --- a/emacs/notmuch-tree.el
> +++ b/emacs/notmuch-tree.el
> @@ -1451,11 +1451,11 @@ notmuch-tree buffers, just set
>(unless (derived-mode-p 'notmuch-tree-mode)
>  (user-error "notmuch-tree-outline-mode is only meaningful for notmuch 
> trees!"))
>(if notmuch-tree-outline-mode
> -  (progn (setq-local outline-regexp "^[^\n]+"
> -outline-level #'notmuch-tree-outline--level)
> +  (progn (setq-local outline-regexp "^[^\n]+")
> +(setq-local outline-level #'notmuch-tree-outline--level)
>  (notmuch-tree-outline--set-visibility))
> -(setq-local outline-regexp (default-value 'outline-regexp)
> -   outline-level (default-value 'outline-level
> +(setq-local outline-regexp (default-value 'outline-regexp))
> +(setq-localoutline-level (default-value 'outline-level
>

Thanks, notmuch.git master plus this patch builds happily again on
EPEL 8 (and 9, and ...).

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


[PATCH] emacs/tree: use two argument form of setq-local

2023-02-21 Thread David Bremner
Apparently the macro setq-local only takes two arguments in Emacs 26.1
---
 emacs/notmuch-tree.el | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el
index 14775d59..b58fa6a6 100644
--- a/emacs/notmuch-tree.el
+++ b/emacs/notmuch-tree.el
@@ -1451,11 +1451,11 @@ notmuch-tree buffers, just set
   (unless (derived-mode-p 'notmuch-tree-mode)
 (user-error "notmuch-tree-outline-mode is only meaningful for notmuch 
trees!"))
   (if notmuch-tree-outline-mode
-  (progn (setq-local outline-regexp "^[^\n]+"
-outline-level #'notmuch-tree-outline--level)
+  (progn (setq-local outline-regexp "^[^\n]+")
+(setq-local outline-level #'notmuch-tree-outline--level)
 (notmuch-tree-outline--set-visibility))
-(setq-local outline-regexp (default-value 'outline-regexp)
-   outline-level (default-value 'outline-level
+(setq-local outline-regexp (default-value 'outline-regexp))
+(setq-localoutline-level (default-value 'outline-level
 
 ;;; _
 
-- 
2.39.1

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