Re: [PATCH v4] Add user option for specifying path to notmuch-extract-patch

[Kyle Meyer <kyle@kyleam.com>]

Thanks for the update.

Leo writes:

> +(defcustom piem-notmuch-extract-patch-executable "notmuch-extract-patch"
> +  "Which notmuch-extract-patch executable to use."
> +  :type 'string)

Looks good.  I'll add a package-version keyword on apply.

> @@ -120,8 +124,7 @@ (defun piem-notmuch-extract-patch-am-ready-mbox ()
>                    (mm-dissect-buffer))) 0))
>      (let ((thread-id notmuch-show-thread-id))
>        (lambda ()
> -        (if-let ((cmd (executable-find "notmuch-extract-patch"))
> -                 (tid
> +        (if-let ((tid
>                    ;; Copied from mailscripts.el
>                    ;;
>                    ;; If `notmuch-show' was called with a notmuch query rather
> @@ -134,7 +137,7 @@ (defun piem-notmuch-extract-patch-am-ready-mbox ()
>                    (if (string= (substring thread-id 0 7) "thread:")
>                        thread-id
>                      (concat "thread:{" thread-id "}"))))
> -            (call-process cmd nil t nil
> +            (call-process piem-notmuch-extract-patch-executable nil t nil
>                            tid)
>            (user-error "The executable notmuch-extract-patch was not found"))))))

This user-error is no longer accurate because it would only be signaled
if notmuch-show-thread-id is unexpectedly nil.  I've amended your patch
to drop this if-let binding, moving the tid binding outside the lambda.

Pushed (955abe41) with the changes below on top.

diff --git a/piem-notmuch.el b/piem-notmuch.el
index 34231a50..71d56f7e 100644
--- a/piem-notmuch.el
+++ b/piem-notmuch.el
@@ -40,6 +40,7 @@ (defgroup piem-notmuch nil
 
 (defcustom piem-notmuch-extract-patch-executable "notmuch-extract-patch"
   "Which notmuch-extract-patch executable to use."
+  :package-version '(piem . "0.4.0")
   :type 'string)
 
 (defmacro piem-notmuch--with-current-message (&rest body)
@@ -122,24 +123,25 @@ (defun piem-notmuch-extract-patch-am-ready-mbox ()
              (= (notmuch-count-attachments
                  (piem-notmuch--with-current-message
                   (mm-dissect-buffer))) 0))
-    (let ((thread-id notmuch-show-thread-id))
+    (let* ((thread-id
+            (or notmuch-show-thread-id
+                (error "bug: notmuch-show-thread-id unexpectedly nil")))
+           (tid
+            ;; Copied from mailscripts.el
+            ;;
+            ;; If `notmuch-show' was called with a notmuch query rather
+            ;; than a thread ID, as `org-notmuch-follow-link' in
+            ;; org-notmuch.el does, then `notmuch-show-thread-id' might
+            ;; be an arbitrary notmuch query instead of a thread ID.  We
+            ;; need to wrap such a query in thread:{} before passing it
+            ;; to notmuch-extract-patch(1), or we might not get a whole
+            ;; thread extracted (e.g. if the query is just id:foo)
+            (if (string= (substring thread-id 0 7) "thread:")
+                thread-id
+              (concat "thread:{" thread-id "}"))))
       (lambda ()
-        (if-let ((tid
-                  ;; Copied from mailscripts.el
-                  ;;
-                  ;; If `notmuch-show' was called with a notmuch query rather
-                  ;; than a thread ID, as `org-notmuch-follow-link' in
-                  ;; org-notmuch.el does, then `notmuch-show-thread-id' might
-                  ;; be an arbitrary notmuch query instead of a thread ID.  We
-                  ;; need to wrap such a query in thread:{} before passing it
-                  ;; to notmuch-extract-patch(1), or we might not get a whole
-                  ;; thread extracted (e.g. if the query is just id:foo)
-                  (if (string= (substring thread-id 0 7) "thread:")
-                      thread-id
-                    (concat "thread:{" thread-id "}"))))
-            (call-process piem-notmuch-extract-patch-executable nil t nil
-                          tid)
-          (user-error "The executable notmuch-extract-patch was not found"))))))
+        (call-process piem-notmuch-extract-patch-executable nil t nil
+                      tid)))))
 
 (defun piem-notmuch-show-get-public-inbox-link (mid)
   "Given the message-id MID, return the public-inbox url.