* vc-hg.el (vc-hg-log-view-mode): Fix last change.

* log-view.el (log-view-mode-menu): New menu.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 445cd41d70e816244c4f08e295a4d31a80594663..5865c2ff0c156bb17cf45c386595b4a41095e3c1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+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-mode.el (diff-font-lock-keywords): Fix M. Kifer's last change

diff --git a/lisp/log-view.el b/lisp/log-view.el
index eff24771dd53d14ce6eff4f7ac72aa9b465c12e7..0f2b8d77e130758e342e013ab8f1041fed6039d6 100644 (file)
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -105,6 +105,20 @@
   ;; or a minor-mode-map with lower precedence than the local map.
   :inherit (if (boundp 'cvs-mode-map) cvs-mode-map))
 
+(easy-menu-define log-view-mode-menu log-view-mode-map
+  "Log-View Display Menu"
+  `("Log-View"
+    ;; XXX Do we need menu entries for these?
+    ;; ["Quit"  quit-window]
+    ;; ["Kill This Buffer"  kill-this-buffer]
+    ["Mark Log Entry for Diff"  set-mark-command]
+    ["Diff Revisions"  log-view-diff]
+    ["Visit Version"  log-view-find-version]
+    ["Next Log Entry"  log-view-msg-next]
+    ["Previous Log Entry"  log-view-msg-prev]
+    ["Next File"  log-view-file-next]
+    ["Previous File"  log-view-file-prev]))
+
 (defvar log-view-mode-hook nil
   "Hook run at the end of `log-view-mode'.")
 

diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index f7b37af42a36831c770c8582e524d53b5efdc2f3..36921013b8f00bb2ca1d217080cac85ac3a17989 100644 (file)
--- 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
-        log-view-font-lock-keywords
+        (copy-alist 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."