[PATCH v3 29/34] emacs: Remove notmuch-setq-local

Subject: [PATCH v3 29/34] emacs: Remove notmuch-setq-local

Date: Sat, 8 Aug 2020 13:50:04 +0200

Cc:

Just use setq-local, which existed since Emacs 24.3.
---
 emacs/notmuch-address.el | 4 ++--
 emacs/notmuch-company.el | 2 +-
 emacs/notmuch-compat.el  | 8 --------
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/emacs/notmuch-address.el b/emacs/notmuch-address.el
index cd0ffb67..8a6d299c 100644
--- a/emacs/notmuch-address.el
+++ b/emacs/notmuch-address.el
@@ -172,11 +172,11 @@ (defun notmuch-address-toggle-internal-completion ()
   (interactive)
   (if (local-variable-p 'notmuch-address-command)
       (kill-local-variable 'notmuch-address-command)
-    (notmuch-setq-local notmuch-address-command 'internal))
+    (setq-local notmuch-address-command 'internal))
   (when (boundp 'company-idle-delay)
     (if (local-variable-p 'company-idle-delay)
 	(kill-local-variable 'company-idle-delay)
-      (notmuch-setq-local company-idle-delay nil))))
+      (setq-local company-idle-delay nil))))
 
 (defun notmuch-address-matching (substring)
   "Returns a list of completion candidates matching SUBSTRING.
diff --git a/emacs/notmuch-company.el b/emacs/notmuch-company.el
index 24e7446c..9ee8ceca 100644
--- a/emacs/notmuch-company.el
+++ b/emacs/notmuch-company.el
@@ -62,7 +62,7 @@ (defun notmuch-company-setup ()
   ;; internal completion) can still be accessed via standard company
   ;; functions, e.g., company-complete.
   (unless (eq notmuch-address-command 'internal)
-    (notmuch-setq-local company-idle-delay nil)))
+    (setq-local company-idle-delay nil)))
 
 ;;;###autoload
 (defun notmuch-company (command &optional arg &rest _ignore)
diff --git a/emacs/notmuch-compat.el b/emacs/notmuch-compat.el
index 370cafa1..fafc64f3 100644
--- a/emacs/notmuch-compat.el
+++ b/emacs/notmuch-compat.el
@@ -40,14 +40,6 @@ (defun notmuch-message--fold-long-headers ()
 (unless (fboundp 'message--fold-long-headers)
   (add-hook 'message-header-hook 'notmuch-message--fold-long-headers))
 
-(if (fboundp 'setq-local)
-    (defalias 'notmuch-setq-local 'setq-local)
-  (defmacro notmuch-setq-local (var val)
-    "Set variable VAR to value VAL in current buffer.
-
-Backport of setq-local for emacs without setq-local (pre 24.3)."
-    `(set (make-local-variable ',var) ,val)))
-
 (if (fboundp 'read-char-choice)
     (defalias 'notmuch-read-char-choice 'read-char-choice)
   (defun notmuch-read-char-choice (prompt chars &optional inhibit-keyboard-quit)
-- 
2.28.0
_______________________________________________
notmuch mailing list -- notmuch@notmuchmail.org
To unsubscribe send an email to notmuch-leave@notmuchmail.org

Previous message (by thread): Re: [PATCH v3 00/34] A great number of cosmetic changes

Thread:

Jonas Bernoulli—[PATCH 00/23] A create number of cosmetic changes [inbox, unread]
- Jonas Bernoulli—[PATCH 01/23] emacs: Shorten long lines [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Tomi Ollila—Re: [PATCH 01/23] emacs: Shorten long lines [inbox, unread]
    - Jonas Bernoulli—Re: [PATCH 01/23] emacs: Shorten long lines [inbox, unread]
- Jonas Bernoulli—[PATCH 02/23] emacs: Remove excess empty lines [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Tomi Ollila—Re: [PATCH 02/23] emacs: Remove excess empty lines [inbox, unread]
    - Jonas Bernoulli—Re: [PATCH 02/23] emacs: Remove excess empty lines [inbox, unread]
- Jonas Bernoulli—[PATCH 03/23] emacs: Fix indentation [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Tomi Ollila—Re: [PATCH 03/23] emacs: Fix indentation [inbox, unread]
    - Jonas Bernoulli—Re: [PATCH 03/23] emacs: Fix indentation [inbox, unread]
- Jonas Bernoulli—[PATCH 04/23] emacs: Closing parenthesis go on the same line [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 05/23] emacs: Only set one variable per setq form [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 06/23] emacs: Use cl-incf where appropriate [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 07/23] emacs: Use 'and' instead of 'when' when the return value matters [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Sean Whitton—Re: [PATCH 07/23] emacs: Use 'and' instead of 'when' when the return value matters [inbox, unread]
    - Jonas Bernoulli—Re: [PATCH 07/23] emacs: Use 'and' instead of 'when' when the return value matters [inbox, unread]
      - Sean Whitton—Re: [PATCH 07/23] emacs: Use 'and' instead of 'when' when the return value matters [inbox, unread]
        Jonas Bernoulli—Re: [PATCH 07/23] emacs: Use 'and' instead of 'when' when the return value matters [inbox, unread]
- Jonas Bernoulli—[PATCH 08/23] emacs: Use 'unless' instead of 'when' and 'not' [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 09/23] emacs: Use 'when' instead of 'if' when there is no ELSE part [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 10/23] emacs: Use one or three lines for 'if' forms [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 11/23] emacs: Extend face to window edge again [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 12/23] emacs: Fix some function declarations [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 13/23] emacs: No longer define notmuch-hello-mode-map as a function [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 14/23] emacs: notmuch-poll: Let the user know we are polling [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 15/23] emacs: Use makefile-gmake-mode in Makefile*s [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 16/23] emacs: Improve doc-strings [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 17/23] emacs: Autoload notmuch-jump-search only once [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 18/23] emacs: Autoload notmuch-jump using an autoload cookie [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 19/23] emacs: Various cosmetic changes [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 20/23] emacs: Increase consistency of library headers [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 21/23] Fix typos [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 22/23] .dir-locals.el: Set variables for correct "shell" mode [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH 23/23] test: Fix indentation [inbox, notmuch::obsolete, notmuch::patch, unread]
- Tomi Ollila—Re: [PATCH 00/23] A create number of cosmetic changes [inbox, unread]
  - Jonas Bernoulli—Re: [PATCH 00/23] A great number of cosmetic changes [inbox, unread]
    - David Bremner—Re: [PATCH 00/23] A great number of cosmetic changes [inbox, unread]
- Jonas Bernoulli—[PATCH v2 00/23] A great number of cosmetic changes [inbox, unread]
  - Jonas Bernoulli—[PATCH v2 01/23] emacs: Shorten long lines [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 02/23] emacs: Remove excess empty lines [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 03/23] emacs: Fix indentation [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 04/23] emacs: Closing parenthesis go on the same line [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 05/23] emacs: Only set one variable per setq form [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 06/23] emacs: Use cl-incf where appropriate [inbox, notmuch::obsolete, notmuch::patch, unread]
    - David Bremner—Re: [PATCH v2 06/23] emacs: Use cl-incf where appropriate [inbox, unread]
      - Jonas Bernoulli—Re: [PATCH v2 06/23] emacs: Use cl-incf where appropriate [inbox, unread]
        Tomi Ollila—Re: [PATCH v2 06/23] emacs: Use cl-incf where appropriate [inbox, unread]
        David Bremner—Re: [PATCH v2 06/23] emacs: Use cl-incf where appropriate [inbox, unread]
  - Jonas Bernoulli—[PATCH v2 07/23] emacs: Use 'and' instead of 'when' when the return value matters [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 08/23] emacs: Use 'unless' instead of 'when' and 'not' [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 09/23] emacs: Use 'when' instead of 'if' when there is no ELSE part [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 10/23] emacs: Use one or three lines for 'if' forms [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 11/23] emacs: Extend face to window edge again [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 12/23] emacs: Fix some function declarations [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 13/23] emacs: No longer define notmuch-hello-mode-map as a function [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 14/23] emacs: notmuch-poll: Let the user know we are polling [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 15/23] emacs: Use makefile-gmake-mode in Makefile*s [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 16/23] emacs: Improve doc-strings [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 17/23] emacs: Autoload notmuch-jump-search only once [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 18/23] emacs: Autoload notmuch-jump using an autoload cookie [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 19/23] emacs: Various cosmetic changes [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 20/23] emacs: Increase consistency of library headers [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 21/23] Fix typos [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 22/23] .dir-locals.el: Set variables for correct "shell" mode [inbox, notmuch::obsolete, notmuch::patch, unread]
  - Jonas Bernoulli—[PATCH v2 23/23] test: Fix indentation [inbox, notmuch::obsolete, notmuch::patch, unread]
- Jonas Bernoulli—[PATCH v3 00/34] A great number of cosmetic changes [inbox, unread]
  - Jonas Bernoulli—[PATCH v3 01/34] emacs: Shorten long lines [inbox, notmuch::patch, notmuch::pushed, notmuch::trivial, unread]
  - Jonas Bernoulli—[PATCH v3 02/34] emacs: Remove excess empty lines [inbox, notmuch::patch, notmuch::pushed, notmuch::trivial, unread]
  - Jonas Bernoulli—[PATCH v3 03/34] emacs: Fix indentation [inbox, notmuch::patch, notmuch::pushed, notmuch::trivial, unread]
  - Jonas Bernoulli—[PATCH v3 04/34] emacs: Closing parenthesis go on the same line [inbox, notmuch::patch, notmuch::pushed, notmuch::trivial, unread]
  - Jonas Bernoulli—[PATCH v3 05/34] emacs: Only set one variable per setq form [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 06/34] emacs: Use 'and' instead of 'when' when the return value matters [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 07/34] emacs: Use 'unless' instead of 'when' and 'not' [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 08/34] emacs: Use 'when' instead of 'if' when there is no ELSE part [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 09/34] emacs: Use one or three lines for 'if' forms [inbox, notmuch::patch, notmuch::pushed, notmuch::trivial, unread]
  - Jonas Bernoulli—[PATCH v3 10/34] emacs: Extend face to window edge again [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 11/34] emacs: Fix some function declarations [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 12/34] emacs: No longer define notmuch-hello-mode-map as a function [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 13/34] emacs: notmuch-poll: Let the user know we are polling [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 14/34] emacs: Use makefile-gmake-mode in Makefile*s [inbox, notmuch::patch, notmuch::pushed, notmuch::trivial, unread]
  - Jonas Bernoulli—[PATCH v3 15/34] emacs: Improve doc-strings [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 16/34] emacs: Autoload notmuch-jump-search only once [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 17/34] emacs: Autoload notmuch-jump using an autoload cookie [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 18/34] emacs: Various cosmetic changes [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 19/34] emacs: Increase consistency of library headers [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 20/34] Fix typos [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 21/34] .dir-locals.el: Set variables for correct "shell" mode [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 22/34] test: Fix indentation [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 23/34] .gitignore: Sort using sort-lines [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 24/34] emacs: Provide 'rstdoc' feature at end of file [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 25/34] emacs: Add end-of-file line to libraries that lack it [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 26/34] NEWS: Add stub for 0.31 [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 27/34] NEWS: At least Emacs 25.1 is required now [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 28/34] emacs: Use cl-incf where appropriate [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 29/34] emacs: Remove notmuch-setq-local [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 30/34] emacs: Remove notmuch-read-char-choice [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 31/34] emacs: Drop old advices that were only need for Emacs 23 [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 32/34] emacs: Do not abuse advice to monkey patch while testing [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 33/34] emacs: Use new advice mechanism do advice mm-shr [inbox, notmuch::patch, notmuch::pushed, unread]
  - Jonas Bernoulli—[PATCH v3 34/34] try-emacs-mua: Trim `require' advice for Emacs 25 [inbox, notmuch::patch, notmuch::pushed, unread]
  - Tomi Ollila—Re: [PATCH v3 00/34] A great number of cosmetic changes [inbox, unread]
    - Jonas Bernoulli—Re: [PATCH v3 00/34] A great number of cosmetic changes [inbox, unread]
  - David Bremner—Re: [PATCH v3 00/34] A great number of cosmetic changes [inbox, unread]
    - Đoàn Trần Công Danh—Re: [PATCH v3 00/34] A great number of cosmetic changes [inbox, unread]
      - Jonas Bernoulli—Re: [PATCH v3 00/34] A great number of cosmetic changes [inbox, unread]
    - Jonas Bernoulli—Re: [PATCH v3 00/34] A great number of cosmetic changes [inbox, unread]
    - Tomi Ollila—Re: [PATCH v3 00/34] A great number of cosmetic changes [inbox, unread]
      - David Bremner—Re: [PATCH v3 00/34] A great number of cosmetic changes [attachment, inbox, unread]