aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2009-10-05 15:12:29 +0000
committerDan Nicolaescu2009-10-05 15:12:29 +0000
commit4a827e0af1fd28cdaafb0b718fd679b76e249e01 (patch)
tree4d63612fdb3c9b264922d1506793e59e311a99e0
parentc66b7ac005b4bfc923764dce8c492ed7b9171ef1 (diff)
downloademacs-4a827e0af1fd28cdaafb0b718fd679b76e249e01.tar.gz
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 @@
12009-10-05 Dan Nicolaescu <dann@ics.uci.edu> 12009-10-05 Dan Nicolaescu <dann@ics.uci.edu>
2 2
3 * vc-hg.el (log-view-vc-backend): Declare for compiler.
4 (vc-hg-outgoing-mode, vc-hg-incoming-mode): Set
5 log-view-vc-backend so that diff can work.
6
3 * log-view.el (log-view-diff): Use vc-diff-internal instead of 7 * log-view.el (log-view-diff): Use vc-diff-internal instead of
4 vc-version-diff. 8 vc-version-diff.
5 (vc-diff-internal): Autoload this instead of vc-version-diff. 9 (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."
446 446
447(defun vc-hg-extra-status-menu () vc-hg-extra-menu-map) 447(defun vc-hg-extra-status-menu () vc-hg-extra-menu-map)
448 448
449(define-derived-mode vc-hg-outgoing-mode vc-hg-log-view-mode "Hg-Outgoing") 449(defvar log-view-vc-backend)
450 450
451(define-derived-mode vc-hg-incoming-mode vc-hg-log-view-mode "Hg-Incoming") 451(define-derived-mode vc-hg-outgoing-mode vc-hg-log-view-mode "Hg-Outgoing"
452 "Mode for browsing Hg outgoing changes."
453 (set (make-local-variable 'log-view-vc-backend) 'Hg))
454
455(define-derived-mode vc-hg-incoming-mode vc-hg-log-view-mode "Hg-Incoming"
456 "Mode for browsing Hg incoming changes."
457 (set (make-local-variable 'log-view-vc-backend) 'Hg))
452 458
453(defstruct (vc-hg-extra-fileinfo 459(defstruct (vc-hg-extra-fileinfo
454 (:copier nil) 460 (:copier nil)
@@ -569,14 +575,16 @@ REV is the revision to check out into WORKFILE."
569 575
570(defun vc-hg-outgoing () 576(defun vc-hg-outgoing ()
571 (interactive) 577 (interactive)
572 (let ((bname "*Hg outgoing*") (vc-short-log nil)) 578 (let ((bname "*Hg outgoing*")
579 (vc-short-log nil))
573 (vc-hg-command bname 1 nil "outgoing" "-n") 580 (vc-hg-command bname 1 nil "outgoing" "-n")
574 (pop-to-buffer bname) 581 (pop-to-buffer bname)
575 (vc-hg-outgoing-mode))) 582 (vc-hg-outgoing-mode)))
576 583
577(defun vc-hg-incoming () 584(defun vc-hg-incoming ()
578 (interactive) 585 (interactive)
579 (let ((bname "*Hg incoming*") (vc-short-log nil)) 586 (let ((bname "*Hg incoming*")
587 (vc-short-log nil))
580 (vc-hg-command bname 0 nil "incoming" "-n") 588 (vc-hg-command bname 0 nil "incoming" "-n")
581 (pop-to-buffer bname) 589 (pop-to-buffer bname)
582 (vc-hg-incoming-mode))) 590 (vc-hg-incoming-mode)))