branch: elpa/magit
commit 1c723f86a3eb75d2082506942b3bc057406b0287
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
Fix indentation
---
lisp/git-rebase.el | 16 ++++++++--------
lisp/magit-files.el | 2 +-
lisp/magit-push.el | 12 ++++++------
lisp/magit-section.el | 5 +++--
4 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/lisp/git-rebase.el b/lisp/git-rebase.el
index 9d3cb29fa33..b019bc50893 100644
--- a/lisp/git-rebase.el
+++ b/lisp/git-rebase.el
@@ -371,14 +371,14 @@ BATCH also ignores commented lines."
(and (looking-at (concat re-start re)) type)))
git-rebase-line-regexps)]
(git-rebase-action
- :action-type type
- :action (and-let ((action (match-str 1)))
- (or (cdr (assoc action git-rebase-short-options))
- action))
- :action-options (match-str 2)
- :target (match-str 3)
- :trailer (match-str 5)
- :comment-p (and (match-str 99) t)))
+ :action-type type
+ :action (and-let ((action (match-str 1)))
+ (or (cdr (assoc action git-rebase-short-options))
+ action))
+ :action-options (match-str 2)
+ :target (match-str 3)
+ :trailer (match-str 5)
+ :comment-p (and (match-str 99) t)))
((not batch)
;; Use empty object rather than nil to ease handling.
(git-rebase-action)))))
diff --git a/lisp/magit-files.el b/lisp/magit-files.el
index 8519773351e..c2c2f7ee4ce 100644
--- a/lisp/magit-files.el
+++ b/lisp/magit-files.el
@@ -122,7 +122,7 @@ A non-nil value for REVERT is ignored if REV is
\"{worktree}\"."
(buffer-local-value 'auto-revert-mode $))
(cons "." revert-without-query)
revert-without-query)))
- (find-file-noselect file-abs))
+ (find-file-noselect file-abs))
(with-current-buffer (magit-get-revision-buffer-create rev file-rel)
(when (or (not magit-buffer-file-name)
(if (eq revert 'ask-revert)
diff --git a/lisp/magit-push.el b/lisp/magit-push.el
index f31ff9ed088..ea1b9a2ea1d 100644
--- a/lisp/magit-push.el
+++ b/lisp/magit-push.el
@@ -300,12 +300,12 @@ what this command will do. To add it use something like:
;; Note: Avoid `magit-get-remote' because it
;; filters out the local repo case (".").
(magit-get "branch" branch "remote")
- (cond-let
- [[remotes (magit-list-remotes)]]
- ((and (magit-git-version>= "2.27")
- (length= remotes 1))
- (car remotes))
- ((car (member "origin" remotes)))))))
+ (cond-let
+ [[remotes (magit-list-remotes)]]
+ ((and (magit-git-version>= "2.27")
+ (length= remotes 1))
+ (car remotes))
+ ((car (member "origin" remotes)))))))
(if (null remote)
"nothing (no remote)"
(let ((refspec (magit-get "remote" remote "push")))
diff --git a/lisp/magit-section.el b/lisp/magit-section.el
index b875d4fadf6..c86862f9d76 100644
--- a/lisp/magit-section.el
+++ b/lisp/magit-section.el
@@ -105,7 +105,8 @@ similar defect.")
'magit-section-keep-region-overlay "Magit-Section 4.0.0")
(make-obsolete-variable 'magit-section-visibility-indicator
- 'magit-section-visibility-indicators "Magit-Section 4.5.0")
+ 'magit-section-visibility-indicators
+ "Magit-Section 4.5.0")
;;; Hooks
@@ -1939,7 +1940,7 @@ to nil." (bound-and-true-p long-line-threshold))
:warning)))))
('unstaged 'staged)
('unpushed 'unpulled)
('unpulled 'unpushed))
- (magit-get-section `((,$) (status))))
+ (magit-get-section `((,$) (status))))
(and$ (magit-section-siblings section 'next)
(magit-get-section (magit-section-ident (car $))))
(and$ (magit-section-siblings section 'prev)
