branch: elpa/git-commit commit 4e5bd4fa583e2f4a3b5a917832e58ba5a3477788 Author: Jonas Bernoulli <jo...@bernoul.li> Commit: Jonas Bernoulli <jo...@bernoul.li>
magit--with-connection-local-variables: Use suitable indentation It's a "with-something" macro, so indent the body accordingly. --- lisp/magit-base.el | 2 ++ lisp/magit-bisect.el | 4 ++-- lisp/magit-git.el | 12 ++++++------ lisp/magit.el | 4 ++-- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/lisp/magit-base.el b/lisp/magit-base.el index 98bc17e036..0059e48a45 100644 --- a/lisp/magit-base.el +++ b/lisp/magit-base.el @@ -1228,6 +1228,8 @@ Magit." ,@body) ,@body))) +(put 'magit--with-connection-local-variables 'lisp-indent-function 'defun) + ;;; Miscellaneous (defun magit-message (format-string &rest args) diff --git a/lisp/magit-bisect.el b/lisp/magit-bisect.el index 8daac3c9d9..b6dfd6bffc 100644 --- a/lisp/magit-bisect.el +++ b/lisp/magit-bisect.el @@ -210,8 +210,8 @@ bisect run'." (list "bisect" "start" bad good args))) (magit-refresh))) (magit--with-connection-local-variables - (magit-git-bisect "run" (list shell-file-name - shell-command-switch cmdline)))) + (magit-git-bisect "run" (list shell-file-name + shell-command-switch cmdline)))) (defun magit-git-bisect (subcommand &optional args no-assert) (unless (or no-assert (magit-bisect-in-progress-p)) diff --git a/lisp/magit-git.el b/lisp/magit-git.el index bb84b1d0b8..65b3075e19 100644 --- a/lisp/magit-git.el +++ b/lisp/magit-git.el @@ -2281,12 +2281,12 @@ If `first-parent' is set, traverse only first parents." (defun magit-patch-id (rev) (magit--with-connection-local-variables - (magit--with-temp-process-buffer - (magit-process-file - shell-file-name nil '(t nil) nil shell-command-switch - (let ((exec (shell-quote-argument (magit-git-executable)))) - (format "%s diff-tree -u %s | %s patch-id" exec rev exec))) - (car (split-string (buffer-string)))))) + (magit--with-temp-process-buffer + (magit-process-file + shell-file-name nil '(t nil) nil shell-command-switch + (let ((exec (shell-quote-argument (magit-git-executable)))) + (format "%s diff-tree -u %s | %s patch-id" exec rev exec))) + (car (split-string (buffer-string)))))) (defun magit-rev-format (format &optional rev args) ;; Prefer `git log --no-walk' to `git show --no-patch' because it diff --git a/lisp/magit.el b/lisp/magit.el index 1d982cdbb8..96ccff0742 100644 --- a/lisp/magit.el +++ b/lisp/magit.el @@ -483,8 +483,8 @@ is run in the top-level directory of the current working tree." (let ((default-directory (or directory default-directory))) (with-environment-variables (("GIT_PAGER" "cat")) (magit--with-connection-local-variables - (magit-start-process shell-file-name nil - shell-command-switch command)))) + (magit-start-process shell-file-name nil + shell-command-switch command)))) (magit-process-buffer)) (defun magit-read-shell-command (&optional toplevel initial-input)