diff options
| author | Dan Nicolaescu | 2007-06-23 04:30:24 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2007-06-23 04:30:24 +0000 |
| commit | e72e768b75b01340f3e9d190cb0927e7fa1c3733 (patch) | |
| tree | b71458278c79a16702c15d1d28ac7ef95b543c4b | |
| parent | a6d107f1713c2fd9686bef09e8cee009d0119fc8 (diff) | |
| download | emacs-e72e768b75b01340f3e9d190cb0927e7fa1c3733.tar.gz emacs-e72e768b75b01340f3e9d190cb0927e7fa1c3733.zip | |
* vc-hg.el (vc-hg-log-view-mode): Revert incorrect change.
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 4 |
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 @@ | |||
| 15 | 15 | ||
| 16 | 2007-06-23 Dan Nicolaescu <dann@ics.uci.edu> | 16 | 2007-06-23 Dan Nicolaescu <dann@ics.uci.edu> |
| 17 | 17 | ||
| 18 | * vc-hg.el (vc-hg-log-view-mode): Fix last change. | ||
| 19 | |||
| 20 | * log-view.el (log-view-mode-menu): New menu. | 18 | * log-view.el (log-view-mode-menu): New menu. |
| 21 | 19 | ||
| 22 | 2007-06-22 Stefan Monnier <monnier@iro.umontreal.ca> | 20 | 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 @@ | |||
| 142 | "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)") | 142 | "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)") |
| 143 | (set (make-local-variable 'log-view-font-lock-keywords) | 143 | (set (make-local-variable 'log-view-font-lock-keywords) |
| 144 | (append | 144 | (append |
| 145 | (copy-alist log-view-font-lock-keywords) | 145 | log-view-font-lock-keywords |
| 146 | ;; Handle the case: | 146 | ;; Handle the case: |
| 147 | ;; user: foo@bar | 147 | ;; user: foo@bar |
| 148 | '(("^user:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" | 148 | '(("^user:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" |
| @@ -153,7 +153,7 @@ | |||
| 153 | (1 'change-log-name) | 153 | (1 'change-log-name) |
| 154 | (2 'change-log-email)) | 154 | (2 'change-log-email)) |
| 155 | ("^date: \\(.+\\)" (1 'change-log-date)) | 155 | ("^date: \\(.+\\)" (1 'change-log-date)) |
| 156 | ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) | 156 | ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))) |
| 157 | 157 | ||
| 158 | (defun vc-hg-diff (file &optional oldvers newvers buffer) | 158 | (defun vc-hg-diff (file &optional oldvers newvers buffer) |
| 159 | "Get a difference report using hg between two versions of FILE." | 159 | "Get a difference report using hg between two versions of FILE." |