summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2007-06-23 04:30:24 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2007-06-23 04:30:24 +0000
commite72e768b75b01340f3e9d190cb0927e7fa1c3733 (patch)
treeb71458278c79a16702c15d1d28ac7ef95b543c4b /lisp
parenta6d107f1713c2fd9686bef09e8cee009d0119fc8 (diff)
downloademacs-e72e768b75b01340f3e9d190cb0927e7fa1c3733.tar.gz
* vc-hg.el (vc-hg-log-view-mode): Revert incorrect change.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/vc-hg.el4
2 files changed, 2 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5e573024c87..943898395b6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -15,8 +15,6 @@
2007-06-23 Dan Nicolaescu <dann@ics.uci.edu>
- * vc-hg.el (vc-hg-log-view-mode): Fix last change.
-
* log-view.el (log-view-mode-menu): New menu.
2007-06-22 Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 36921013b8f..6a80fccbcbd 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -142,7 +142,7 @@
"^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)")
(set (make-local-variable 'log-view-font-lock-keywords)
(append
- (copy-alist log-view-font-lock-keywords)
+ log-view-font-lock-keywords
;; Handle the case:
;; user: foo@bar
'(("^user:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
@@ -153,7 +153,7 @@
(1 'change-log-name)
(2 'change-log-email))
("^date: \\(.+\\)" (1 'change-log-date))
- ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))
+ ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))
(defun vc-hg-diff (file &optional oldvers newvers buffer)
"Get a difference report using hg between two versions of FILE."