aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2007-06-23 03:06:21 +0000
committerDan Nicolaescu2007-06-23 03:06:21 +0000
commitd621bc0ad77a82b54500ae30477fb51bf4ebfb48 (patch)
tree7c4eb0ef54d7deda33bae55ab4899f591c751d8d
parent511a18d9e2ff286517e511dafb9b1a3829b59708 (diff)
downloademacs-d621bc0ad77a82b54500ae30477fb51bf4ebfb48.tar.gz
emacs-d621bc0ad77a82b54500ae30477fb51bf4ebfb48.zip
* vc-hg.el (vc-hg-log-view-mode): Fix last change.
* log-view.el (log-view-mode-menu): New menu.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/log-view.el14
-rw-r--r--lisp/vc-hg.el4
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 @@
12007-06-23 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * vc-hg.el (vc-hg-log-view-mode): Fix last change.
4
5 * log-view.el (log-view-mode-menu): New menu.
6
12007-06-22 Stefan Monnier <monnier@iro.umontreal.ca> 72007-06-22 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * diff-mode.el (diff-font-lock-keywords): Fix M. Kifer's last change 9 * 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 @@
105 ;; or a minor-mode-map with lower precedence than the local map. 105 ;; or a minor-mode-map with lower precedence than the local map.
106 :inherit (if (boundp 'cvs-mode-map) cvs-mode-map)) 106 :inherit (if (boundp 'cvs-mode-map) cvs-mode-map))
107 107
108(easy-menu-define log-view-mode-menu log-view-mode-map
109 "Log-View Display Menu"
110 `("Log-View"
111 ;; XXX Do we need menu entries for these?
112 ;; ["Quit" quit-window]
113 ;; ["Kill This Buffer" kill-this-buffer]
114 ["Mark Log Entry for Diff" set-mark-command]
115 ["Diff Revisions" log-view-diff]
116 ["Visit Version" log-view-find-version]
117 ["Next Log Entry" log-view-msg-next]
118 ["Previous Log Entry" log-view-msg-prev]
119 ["Next File" log-view-file-next]
120 ["Previous File" log-view-file-prev]))
121
108(defvar log-view-mode-hook nil 122(defvar log-view-mode-hook nil
109 "Hook run at the end of `log-view-mode'.") 123 "Hook run at the end of `log-view-mode'.")
110 124
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 @@
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 log-view-font-lock-keywords 145 (copy-alist 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."