[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[nongnu] elpa/git-commit 6a5c79fd1b 2/2: Fix indentation
|
From: |
ELPA Syncer |
|
Subject: |
[nongnu] elpa/git-commit 6a5c79fd1b 2/2: Fix indentation |
|
Date: |
Thu, 31 Mar 2022 19:58:13 -0400 (EDT) |
branch: elpa/git-commit
commit 6a5c79fd1b19c5f64b2fdfc04112359954d06c1d
Author: Jonas Bernoulli <jonas@bernoul.li>
Commit: Jonas Bernoulli <jonas@bernoul.li>
Fix indentation
---
lisp/git-commit.el | 18 +++++++++---------
lisp/magit-apply.el | 2 +-
lisp/magit-diff.el | 8 ++++----
lisp/magit-extras.el | 8 ++++----
lisp/magit-libgit.el | 4 ++--
lisp/magit-process.el | 2 +-
lisp/magit-repos.el | 2 +-
lisp/magit-submodule.el | 6 +++---
lisp/magit-transient.el | 8 ++++----
lisp/magit.el | 8 ++++----
10 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/lisp/git-commit.el b/lisp/git-commit.el
index 2ca03fddf2..6f6f8a56d2 100644
--- a/lisp/git-commit.el
+++ b/lisp/git-commit.el
@@ -531,15 +531,15 @@ to recover older messages")
;; Pretend that git-commit-mode is a major-mode,
;; so that directory-local settings can be used.
(let ((default-directory
- (or (and (not (file-exists-p ".dir-locals.el"))
- ;; When $GIT_DIR/.dir-locals.el doesn't exist,
- ;; fallback to $GIT_WORK_TREE/.dir-locals.el,
- ;; because the maintainer can use the latter
- ;; to enforce conventions, while s/he has no
- ;; control over the former.
- (fboundp 'magit-toplevel) ; silence byte-compiler
- (magit-toplevel))
- default-directory)))
+ (or (and (not (file-exists-p ".dir-locals.el"))
+ ;; When $GIT_DIR/.dir-locals.el doesn't exist,
+ ;; fallback to $GIT_WORK_TREE/.dir-locals.el,
+ ;; because the maintainer can use the latter
+ ;; to enforce conventions, while s/he has no
+ ;; control over the former.
+ (fboundp 'magit-toplevel) ; silence byte-compiler
+ (magit-toplevel))
+ default-directory)))
(let ((buffer-file-name nil) ; trick hack-dir-local-variables
(major-mode 'git-commit-mode)) ; trick dir-locals-collect-variables
(hack-dir-local-variables)
diff --git a/lisp/magit-apply.el b/lisp/magit-apply.el
index 66a6333fd5..52db7c0463 100644
--- a/lisp/magit-apply.el
+++ b/lisp/magit-apply.el
@@ -373,7 +373,7 @@ ignored) files."
start))
(let* ((topdir (magit-toplevel))
(url (let ((default-directory
- (file-name-as-directory (expand-file-name repo))))
+ (file-name-as-directory (expand-file-name repo))))
(or (magit-get "remote" (magit-get-some-remote) "url")
(concat (file-name-as-directory ".") repo))))
(package
diff --git a/lisp/magit-diff.el b/lisp/magit-diff.el
index ac1ff6803c..ff0a5bce6e 100644
--- a/lisp/magit-diff.el
+++ b/lisp/magit-diff.el
@@ -917,7 +917,7 @@ and `:slant'."
("=g" "Show signature" "--show-signature"
:if-derived magit-diff-mode)
(5 "-R" "Reverse sides" "-R"
- :if-derived magit-diff-mode)
+ :if-derived magit-diff-mode)
(5 magit-diff:--color-moved)
(5 magit-diff:--color-moved-ws)]
[["Refresh"
@@ -2401,8 +2401,8 @@ section or a child thereof."
" content"))
")")
(let ((default-directory
- (file-name-as-directory
- (expand-file-name module (magit-toplevel)))))
+ (file-name-as-directory
+ (expand-file-name module (magit-toplevel)))))
(magit-git-wash (apply-partially #'magit-log-wash-log 'module)
"log" "--oneline" "--left-right" range)
(delete-char -1)))))
@@ -3230,7 +3230,7 @@ are highlighted."
(cdr (--first (string-match-p (car it) default-directory)
(nreverse
(default-value
- 'magit-diff-highlight-indentation))))))))
+ 'magit-diff-highlight-indentation))))))))
(when (and magit-diff-highlight-trailing
(looking-at (concat prefix ".*?\\([ \t]+\\)$")))
(let ((ov (make-overlay (match-beginning 1) (match-end 1) nil t)))
diff --git a/lisp/magit-extras.el b/lisp/magit-extras.el
index 2881ddfab1..3928d72550 100644
--- a/lisp/magit-extras.el
+++ b/lisp/magit-extras.el
@@ -694,10 +694,10 @@ the minibuffer too."
(interactive
(if (or current-prefix-arg (not magit-revision-stack))
(let ((default-directory
- (or (and (not (= (prefix-numeric-value current-prefix-arg) 16))
- (or (magit-toplevel)
- (cadr (car magit-revision-stack))))
- (magit-read-repository))))
+ (or (and (not (= (prefix-numeric-value current-prefix-arg) 16))
+ (or (magit-toplevel)
+ (cadr (car magit-revision-stack))))
+ (magit-read-repository))))
(list (magit-read-branch-or-commit "Insert revision")
default-directory))
(push (caar magit-revision-stack) magit-revision-history)
diff --git a/lisp/magit-libgit.el b/lisp/magit-libgit.el
index a5baf77a96..6b0ba87948 100644
--- a/lisp/magit-libgit.el
+++ b/lisp/magit-libgit.el
@@ -59,8 +59,8 @@
"Return an object for the repository in DIRECTORY.
If optional DIRECTORY is nil, then use `default-directory'."
(when-let ((default-directory
- (let ((magit-inhibit-libgit t))
- (magit-gitdir directory))))
+ (let ((magit-inhibit-libgit t))
+ (magit-gitdir directory))))
(magit--with-refresh-cache
(cons default-directory 'magit-libgit-repo)
(libgit-repository-open default-directory))))
diff --git a/lisp/magit-process.el b/lisp/magit-process.el
index 651316665a..bbd5730b97 100644
--- a/lisp/magit-process.el
+++ b/lisp/magit-process.el
@@ -619,7 +619,7 @@ Magit status buffer."
(let ((process-connection-type nil)
(process-environment (magit-process-environment))
(default-process-coding-system
- (magit--process-coding-system)))
+ (magit--process-coding-system)))
(apply #'start-file-process "git" process-buf
(magit-git-executable) args))))
(process-put process 'command-buf command-buf)
diff --git a/lisp/magit-repos.el b/lisp/magit-repos.el
index 7b83a03fe1..f8e34ee5d4 100644
--- a/lisp/magit-repos.el
+++ b/lisp/magit-repos.el
@@ -367,7 +367,7 @@ Usually this is just its basename."
?\\'")
(defvar magit-repolist-column-version-resume-regexp
- "\\`Resume development\\'")
+ "\\`Resume development\\'")
(defun magit-repolist-column-version (_)
"Insert a description of the repository's `HEAD' revision."
diff --git a/lisp/magit-submodule.el b/lisp/magit-submodule.el
index 9770da0405..515ef421cd 100644
--- a/lisp/magit-submodule.el
+++ b/lisp/magit-submodule.el
@@ -487,7 +487,7 @@ or, failing that, the abbreviated HEAD commit hash."
(branch-format (format "%%-%is " (min 25 (/ (window-width) 3)))))
(dolist (module modules)
(let ((default-directory
- (expand-file-name (file-name-as-directory module))))
+ (expand-file-name (file-name-as-directory module))))
(magit-insert-section (magit-module-section module t)
(insert (propertize (format path-format module)
'font-lock-face 'magit-diff-file-heading))
@@ -606,7 +606,7 @@ These sections can be expanded to show the respective
commits."
(dolist (module modules)
(when (magit-module-worktree-p module)
(let ((default-directory
- (expand-file-name (file-name-as-directory module))))
+ (expand-file-name (file-name-as-directory module))))
(when (magit-file-accessible-directory-p default-directory)
(magit-insert-section sec (magit-module-section module t)
(magit-insert-heading
@@ -668,7 +668,7 @@ These sections can be expanded to show the respective
commits."
(setq tabulated-list-entries
(-keep (lambda (module)
(let ((default-directory
- (expand-file-name (file-name-as-directory module))))
+ (expand-file-name (file-name-as-directory module))))
(and (file-exists-p ".git")
(or (not magit-submodule-list-predicate)
(funcall magit-submodule-list-predicate module))
diff --git a/lisp/magit-transient.el b/lisp/magit-transient.el
index 2ac82782c6..52745b4e9e 100644
--- a/lisp/magit-transient.el
+++ b/lisp/magit-transient.el
@@ -209,10 +209,10 @@
'transient-inactive-value
'transient-value)))
(default
- (propertize (concat "default:" default)
- 'face (if value
- 'transient-inactive-value
- 'transient-value))))))
+ (propertize (concat "default:" default)
+ 'face (if value
+ 'transient-inactive-value
+ 'transient-value))))))
(propertize "]" 'face 'transient-inactive-value))))
;;; _
diff --git a/lisp/magit.el b/lisp/magit.el
index 24fbf0e8ee..e3dc0e8cce 100644
--- a/lisp/magit.el
+++ b/lisp/magit.el
@@ -455,10 +455,10 @@ is run in the top-level directory of the current working
tree."
(defun magit-read-shell-command (&optional toplevel initial-input)
(let ((default-directory
- (if (or toplevel current-prefix-arg)
- (or (magit-toplevel)
- (magit--not-inside-repository-error))
- default-directory)))
+ (if (or toplevel current-prefix-arg)
+ (or (magit-toplevel)
+ (magit--not-inside-repository-error))
+ default-directory)))
(read-shell-command (if magit-shell-command-verbose-prompt
(format "Async shell command in %s: "
(abbreviate-file-name default-directory))