diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2007-06-23 03:06:21 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2007-06-23 03:06:21 +0000 |
| commit | d621bc0ad77a82b54500ae30477fb51bf4ebfb48 (patch) | |
| tree | 7c4eb0ef54d7deda33bae55ab4899f591c751d8d /lisp | |
| parent | 511a18d9e2ff286517e511dafb9b1a3829b59708 (diff) | |
| download | emacs-d621bc0ad77a82b54500ae30477fb51bf4ebfb48.tar.gz emacs-d621bc0ad77a82b54500ae30477fb51bf4ebfb48.tar.bz2 emacs-d621bc0ad77a82b54500ae30477fb51bf4ebfb48.zip | |
* vc-hg.el (vc-hg-log-view-mode): Fix last change.
* log-view.el (log-view-mode-menu): New menu.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/log-view.el | 14 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 4 |
3 files changed, 22 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 445cd41d70e..5865c2ff0c1 100644 --- 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 eff24771dd5..0f2b8d77e13 100644 --- 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 f7b37af42a3..36921013b8f 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 - 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." |