From: Dan Nicolaescu Date: Wed, 25 Jun 2008 05:35:05 +0000 (+0000) Subject: * vc-hg.el: X-Git-Tag: emacs-pretest-23.0.90~4520 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=10c7e43106d56781fe23fe0ce02c6f19eea52c5e;p=emacs.git * vc-hg.el: * vc-git.el: Require vc-dir when compiling. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index beb1f727bfb..b48777438c0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -4,6 +4,9 @@ 2008-06-25 Dan Nicolaescu + * vc-hg.el: + * vc-git.el: Require vc-dir when compiling. + * vc-dir.el (vc-dir-marked-only-files-and-states): Rename from vc-dir-marked-only-files. Change the return value. (vc-dir-child-files-and-states): Rename from vc-dir-child-files. diff --git a/lisp/vc-git.el b/lisp/vc-git.el index 2293f275910..4c004dd1e35 100644 --- a/lisp/vc-git.el +++ b/lisp/vc-git.el @@ -107,6 +107,7 @@ (eval-when-compile (require 'cl) (require 'vc) + (require 'vc-dir) (require 'grep)) (defvar git-commits-coding-system 'utf-8 diff --git a/lisp/vc-hg.el b/lisp/vc-hg.el index 2f738303a19..7d4150fbb20 100644 --- a/lisp/vc-hg.el +++ b/lisp/vc-hg.el @@ -108,7 +108,8 @@ (eval-when-compile (require 'cl) - (require 'vc)) + (require 'vc) + (require 'vc-dir)) ;;; Customization options