aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDima Kogan2016-02-28 15:18:45 +1030
committerLars Ingebrigtsen2016-02-28 15:18:45 +1030
commite8146d49b04232348edb7b4fff339c89de4e8a76 (patch)
tree127858b756549ff2bcd695700ae1c7a6d7a8c1b3
parentf4b057c67f74e0a7a2c4ff03c19c8236989465d0 (diff)
downloademacs-e8146d49b04232348edb7b4fff339c89de4e8a76.tar.gz
emacs-e8146d49b04232348edb7b4fff339c89de4e8a76.zip
Strip out some leading whitespace when looking at logs
* lisp/vc/vc-git.el (vc-git-expanded-log-entry): When looking at expanded git logs with `vc-print-root-log' (C-x v L, then <enter> by default), Emacs was stripping out all leading whitespace from git logs. I now strip exactly 2 leading spaces, which retains the indentation in the logs (bug#18110).
-rw-r--r--lisp/vc/vc-git.el4
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el
index 1c43e3ec31a..8498cc82761 100644
--- a/lisp/vc/vc-git.el
+++ b/lisp/vc/vc-git.el
@@ -970,7 +970,9 @@ or BRANCH^ (where \"^\" can be repeated)."
970 (goto-char (point-min)) 970 (goto-char (point-min))
971 (unless (eobp) 971 (unless (eobp)
972 ;; Indent the expanded log entry. 972 ;; Indent the expanded log entry.
973 (indent-region (point-min) (point-max) 2) 973 (while (re-search-forward "^ " nil t)
974 (replace-match "")
975 (forward-line))
974 (buffer-string)))) 976 (buffer-string))))
975 977
976(defun vc-git-region-history (file buffer lfrom lto) 978(defun vc-git-region-history (file buffer lfrom lto)