emacs: use closures instead of backquoted lambdas

diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el
index 1e66555b7fc17cb6a2b7c9a755c388ea620a9185..c1b67e22e80d28dd301a8820cefd40b1bf75e586 100644 (file)
--- a/emacs/notmuch-hello.el
+++ b/emacs/notmuch-hello.el
@@ -869,16 +869,16 @@ Supports the following entries in OPTIONS as a plist:
        (start (point)))
     (if is-hidden
        (widget-create 'push-button
        (start (point)))
     (if is-hidden
        (widget-create 'push-button

-                      :notify `(lambda (widget &rest _ignore)
-                                 (setq notmuch-hello-hidden-sections
-                                       (delete ,title notmuch-hello-hidden-sections))
-                                 (notmuch-hello-update))
+                      :notify (lambda (&rest _ignore)
+                                (setq notmuch-hello-hidden-sections
+                                      (delete title notmuch-hello-hidden-sections))
+                                (notmuch-hello-update))

                       "show")
       (widget-create 'push-button
                       "show")
       (widget-create 'push-button

-                    :notify `(lambda (widget &rest _ignore)
-                               (add-to-list 'notmuch-hello-hidden-sections
-                                            ,title)
-                               (notmuch-hello-update))
+                    :notify (lambda (&rest _ignore)
+                              (add-to-list 'notmuch-hello-hidden-sections
+                                           title)
+                              (notmuch-hello-update))

                     "hide"))
     (widget-insert "\n")
     (unless is-hidden
                     "hide"))
     (widget-insert "\n")
     (unless is-hidden

diff --git a/emacs/notmuch-jump.el b/emacs/notmuch-jump.el
index 5ec8eb9c8e3e06839a6e653ef554c50429b34e77..0dc23fb92fa732f44e299e63e2cc91987b6ac3b4 100644 (file)
--- a/emacs/notmuch-jump.el
+++ b/emacs/notmuch-jump.el
@@ -50,11 +50,11 @@ fast way to jump to a saved search from anywhere in Notmuch."
            (push (list key name
                        (cond
                         ((eq (plist-get saved-search :search-type) 'tree)
            (push (list key name
                        (cond
                         ((eq (plist-get saved-search :search-type) 'tree)

-                         `(lambda () (notmuch-tree ',query)))
+                         (lambda () (notmuch-tree query)))

                         ((eq (plist-get saved-search :search-type) 'unthreaded)
                         ((eq (plist-get saved-search :search-type) 'unthreaded)

-                         `(lambda () (notmuch-unthreaded ',query)))
+                         (lambda () (notmuch-unthreaded query)))

                         (t
                         (t

-                         `(lambda () (notmuch-search ',query ',oldest-first)))))
+                         (lambda () (notmuch-search query oldest-first)))))

                  action-map)))))
     (setq action-map (nreverse action-map))
     (if action-map
                  action-map)))))
     (setq action-map (nreverse action-map))
     (if action-map


@@ -168,9 +168,10 @@ buffer."
     (pcase-dolist (`(,key ,_name ,fn) action-map)
       (when (= (length key) 1)
        (define-key map key
     (pcase-dolist (`(,key ,_name ,fn) action-map)
       (when (= (length key) 1)
        (define-key map key

-         `(lambda () (interactive)
-            (setq notmuch-jump--action ',fn)
-            (exit-minibuffer)))))
+         (lambda ()
+           (interactive)
+           (setq notmuch-jump--action fn)
+           (exit-minibuffer)))))

     ;; By doing this in two passes (and checking if we already have a
     ;; binding) we avoid problems if the user specifies a binding which
     ;; is a prefix of another binding.
     ;; By doing this in two passes (and checking if we already have a
     ;; binding) we avoid problems if the user specifies a binding which
     ;; is a prefix of another binding.


@@ -191,12 +192,13 @@ buffer."
                  action-submap)
            (setq action-submap (nreverse action-submap))
            (define-key map keystr
                  action-submap)
            (setq action-submap (nreverse action-submap))
            (define-key map keystr

-             `(lambda () (interactive)
-                (setq notmuch-jump--action
-                      ',(apply-partially #'notmuch-jump
-                                         action-submap
-                                         new-prompt))
-                (exit-minibuffer)))))))
+             (lambda ()
+               (interactive)
+               (setq notmuch-jump--action
+                     (apply-partially #'notmuch-jump
+                                      action-submap
+                                      new-prompt))
+               (exit-minibuffer)))))))

     map))
 
 (provide 'notmuch-jump)
     map))
 
 (provide 'notmuch-jump)

diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el
index ebccb5a089bf59394b6e17026d68bc8ca89c4147..e3a60441a0b51a86d527b1c61fa6e9bd9a64a018 100644 (file)
--- a/emacs/notmuch-tag.el
+++ b/emacs/notmuch-tag.el
@@ -553,7 +553,7 @@ and vice versa."
                                name)
                            (mapconcat #'identity tag-change " "))))
        (push (list key name-string
                                name)
                            (mapconcat #'identity tag-change " "))))
        (push (list key name-string

-                   `(lambda () (,tag-function ',tag-change)))
+                   (lambda () (funcall tag-function tag-change)))

              action-map)))
     (push (list notmuch-tag-jump-reverse-key
                (if reverse
              action-map)))
     (push (list notmuch-tag-jump-reverse-key
                (if reverse