diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2020-02-20 22:12:52 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2020-02-20 22:12:52 -0700 |
commit | cc1f96c07dd0612e9ae44e41f889dd40315f0d75 (patch) | |
tree | bc960e456d1cba9a4070376d63443b1ec8b8f947 /mailscripts.el | |
parent | 46cedb673ae6e63724d010d3fb6a47cc209502f5 (diff) | |
parent | bbf1fc63fa1d88ea204a8cf272511ca85a828794 (diff) | |
download | mailscripts-cc1f96c07dd0612e9ae44e41f889dd40315f0d75.tar.gz |
Merge tag '0.18' into buster-bpo
release 0.18
# gpg: Signature made Sat 15 Feb 2020 03:11:16 PM MST
# gpg: using RSA key 9B917007AE030E36E4FC248B695B7AE4BF066240
# gpg: issuer "spwhitton@spwhitton.name"
# gpg: Good signature from "Sean Whitton <spwhitton@spwhitton.name>" [ultimate]
# Primary key fingerprint: 8DC2 487E 51AB DD90 B5C4 753F 0F56 D055 3B6D 411B
# Subkey fingerprint: 9B91 7007 AE03 0E36 E4FC 248B 695B 7AE4 BF06 6240
Diffstat (limited to 'mailscripts.el')
-rw-r--r-- | mailscripts.el | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/mailscripts.el b/mailscripts.el index 6872dd6..0658c76 100644 --- a/mailscripts.el +++ b/mailscripts.el @@ -1,7 +1,7 @@ ;;; mailscripts.el --- functions to access tools in the mailscripts package ;; Author: Sean Whitton <spwhitton@spwhitton.name> -;; Version: 0.16 +;; Version: 0.18 ;; Package-Requires: (notmuch projectile) ;; Copyright (C) 2018, 2019 Sean Whitton @@ -61,13 +61,13 @@ The target branch may or may not already exist. With an optional prefix numeric argument REROLL-COUNT, try to extract the nth revision of a series. See the --reroll-count -option detailed in notmuch-extract-patch(1). +option detailed in mbox-extract-patch(1). See notmuch-extract-patch(1) manpage for limitations: in particular, this Emacs Lisp function supports passing only entire threads to the notmuch-extract-patch(1) command." (interactive - "Dgit repo: \nsbranch name (or leave blank to apply to current HEAD): \np") + "Dgit repo: \nsbranch name (or leave blank to apply to current HEAD): \nP") (let ((thread-id ;; If `notmuch-show' was called with a notmuch query rather ;; than a thread ID, as `org-notmuch-follow-link' in @@ -82,9 +82,12 @@ threads to the notmuch-extract-patch(1) command." (default-directory (expand-file-name repo))) (mailscripts--check-out-branch branch) (shell-command - (format "notmuch-extract-patch -v%d %s | git am" - (if reroll-count reroll-count 1) - (shell-quote-argument thread-id)) + (if reroll-count + (format "notmuch-extract-patch -v%d %s | git am" + (prefix-numeric-value reroll-count) + (shell-quote-argument thread-id)) + (format "notmuch-extract-patch %s | git am" + (shell-quote-argument thread-id))) "*notmuch-apply-thread-series*"))) ;;;###autoload @@ -92,7 +95,9 @@ threads to the notmuch-extract-patch(1) command." "Like `notmuch-extract-thread-patches', but use projectile to choose the repo." (interactive) (mailscripts--projectile-repo-and-branch - 'notmuch-extract-thread-patches (prefix-numeric-value current-prefix-arg))) + 'notmuch-extract-thread-patches + (when current-prefix-arg + (prefix-numeric-value current-prefix-arg)))) ;;;###autoload (defun notmuch-extract-message-patches (repo branch) |