summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2009-10-05 15:12:29 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2009-10-05 15:12:29 +0000
commit4a827e0af1fd28cdaafb0b718fd679b76e249e01 (patch)
tree4d63612fdb3c9b264922d1506793e59e311a99e0
parentc66b7ac005b4bfc923764dce8c492ed7b9171ef1 (diff)
downloademacs-4a827e0af1fd28cdaafb0b718fd679b76e249e01.tar.gz
emacs-4a827e0af1fd28cdaafb0b718fd679b76e249e01.tar.bz2
emacs-4a827e0af1fd28cdaafb0b718fd679b76e249e01.zip
(log-view-vc-backend): Declare for compiler.
(vc-hg-outgoing-mode, vc-hg-incoming-mode): Set log-view-vc-backend so that diff can work.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/vc-hg.el16
2 files changed, 16 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 560ec8e09a4..29f947eb140 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
2009-10-05 Dan Nicolaescu <dann@ics.uci.edu>
+ * vc-hg.el (log-view-vc-backend): Declare for compiler.
+ (vc-hg-outgoing-mode, vc-hg-incoming-mode): Set
+ log-view-vc-backend so that diff can work.
+
* log-view.el (log-view-diff): Use vc-diff-internal instead of
vc-version-diff.
(vc-diff-internal): Autoload this instead of vc-version-diff.
diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el
index 9ced663fade..1dedff159ed 100644
--- a/lisp/vc-hg.el
+++ b/lisp/vc-hg.el
@@ -446,9 +446,15 @@ REV is the revision to check out into WORKFILE."
(defun vc-hg-extra-status-menu () vc-hg-extra-menu-map)
-(define-derived-mode vc-hg-outgoing-mode vc-hg-log-view-mode "Hg-Outgoing")
+(defvar log-view-vc-backend)
-(define-derived-mode vc-hg-incoming-mode vc-hg-log-view-mode "Hg-Incoming")
+(define-derived-mode vc-hg-outgoing-mode vc-hg-log-view-mode "Hg-Outgoing"
+ "Mode for browsing Hg outgoing changes."
+ (set (make-local-variable 'log-view-vc-backend) 'Hg))
+
+(define-derived-mode vc-hg-incoming-mode vc-hg-log-view-mode "Hg-Incoming"
+ "Mode for browsing Hg incoming changes."
+ (set (make-local-variable 'log-view-vc-backend) 'Hg))
(defstruct (vc-hg-extra-fileinfo
(:copier nil)
@@ -569,14 +575,16 @@ REV is the revision to check out into WORKFILE."
(defun vc-hg-outgoing ()
(interactive)
- (let ((bname "*Hg outgoing*") (vc-short-log nil))
+ (let ((bname "*Hg outgoing*")
+ (vc-short-log nil))
(vc-hg-command bname 1 nil "outgoing" "-n")
(pop-to-buffer bname)
(vc-hg-outgoing-mode)))
(defun vc-hg-incoming ()
(interactive)
- (let ((bname "*Hg incoming*") (vc-short-log nil))
+ (let ((bname "*Hg incoming*")
+ (vc-short-log nil))
(vc-hg-command bname 0 nil "incoming" "-n")
(pop-to-buffer bname)
(vc-hg-incoming-mode)))