branch: externals/diff-hl
commit 1077c734b3b6de02c80456035a4939b028cb4179
Merge: d434060 c35c76a
Author: Dmitry Gutov <dgu...@yandex.ru>
Commit: GitHub <nore...@github.com>
Merge pull request #164 from tarsiiformes/indentation
Fix indentation
---
diff-hl-dired.el | 12 ++++++------
diff-hl-inline-popup.el | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/diff-hl-dired.el b/diff-hl-dired.el
index af2df46..697d978 100644
--- a/diff-hl-dired.el
+++ b/diff-hl-dired.el
@@ -116,8 +116,8 @@ status indicators."
;; Work around http://debbugs.gnu.org/18605
(setq file (replace-regexp-in-string "\\` " "" file))
(let ((type (plist-get
- '(edited change added insert removed delete
- unregistered unknown ignored ignored)
+ '( edited change added insert removed delete
+ unregistered unknown ignored ignored)
state)))
(if (string-match "\\`\\([^/]+\\)/" file)
(let* ((dir (match-string 1 file))
@@ -138,7 +138,7 @@ status indicators."
)))))
(defun diff-hl-dired-status-files (backend dir files update-function)
- "Using version control BACKEND, return list of (FILE STATE EXTRA) entries
+ "Using version control BACKEND, return list of (FILE STATE EXTRA) entries
for DIR containing FILES. Call UPDATE-FUNCTION as entries are added."
(if (version< "25" emacs-version)
(vc-call-backend backend 'dir-status-files dir files update-function)
@@ -147,9 +147,9 @@ for DIR containing FILES. Call UPDATE-FUNCTION as entries
are added."
(when (version< emacs-version "24.4.51.5")
;; Work around http://debbugs.gnu.org/19386
(defadvice vc-git-dir-status-goto-stage (around
- diff-hl-dired-skip-up-to-date
- (stage files update-function)
- activate)
+ diff-hl-dired-skip-up-to-date
+ (stage files update-function)
+ activate)
(when (eq stage 'ls-files-up-to-date)
(setq stage 'diff-index))
ad-do-it))
diff --git a/diff-hl-inline-popup.el b/diff-hl-inline-popup.el
index c0c501d..e94c0c7 100644
--- a/diff-hl-inline-popup.el
+++ b/diff-hl-inline-popup.el
@@ -105,7 +105,7 @@ Default for CONTENT-SIZE is the size of the current lines"
(blank-line (if (display-graphic-p)
""
(concat "\n" (propertize
(diff-hl-inline-popup--separator width)
- 'face '(:underline t)))))
+ 'face '(:underline t)))))
(line (propertize (concat (diff-hl-inline-popup--separator new-width)
footer scroll-indicator)
'face '(:overline t))))
