aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2009-09-15 17:52:42 +0000
committerDan Nicolaescu2009-09-15 17:52:42 +0000
commit79d316d36d3f0165cd92fe1b477897edbe6209c4 (patch)
tree37b9cdbc89b64de14c9ac380b8d9eb646ba318ec
parent8fed6934e51eaf737a157ad97b3e2610f747f8c5 (diff)
downloademacs-79d316d36d3f0165cd92fe1b477897edbe6209c4.tar.gz
emacs-79d316d36d3f0165cd92fe1b477897edbe6209c4.zip
(vc-git-log-view-mode): Undo inadvertent change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-git.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9e7a705f80a..36e6d354622 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12009-09-15 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc-git.el (vc-git-log-view-mode): Undo inadvertent change.
4
12009-09-15 Stefan Monnier <monnier@iro.umontreal.ca> 52009-09-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * Makefile.in (compile-onefile): Use byte-compile-refresh-preloaded. 7 * Makefile.in (compile-onefile): Use byte-compile-refresh-preloaded.
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index 63cefb572c9..8d7b1e8bcc0 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -532,7 +532,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches."
532 (set (make-local-variable 'log-view-message-re) 532 (set (make-local-variable 'log-view-message-re)
533 (if vc-short-log 533 (if vc-short-log
534 "^\\(?:[*/\\| ]+ \\)?\\([0-9a-z]+\\) \\([-a-z0-9]+\\) \\(.*\\)" 534 "^\\(?:[*/\\| ]+ \\)?\\([0-9a-z]+\\) \\([-a-z0-9]+\\) \\(.*\\)"
535 "^[ */\\|]+commit *\\([0-9a-z]+\\)")) 535 "^commit *\\([0-9a-z]+\\)"))
536 (set (make-local-variable 'log-view-font-lock-keywords) 536 (set (make-local-variable 'log-view-font-lock-keywords)
537 (if vc-short-log 537 (if vc-short-log
538 (append 538 (append