diff options
| author | Dan Nicolaescu | 2008-06-25 05:35:05 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-06-25 05:35:05 +0000 |
| commit | 10c7e43106d56781fe23fe0ce02c6f19eea52c5e (patch) | |
| tree | a93c0fc188658d70e5263b59013922dc59343c1e /lisp | |
| parent | 249e6f764ac94156f869193c2bcc6cb17243d86a (diff) | |
| download | emacs-10c7e43106d56781fe23fe0ce02c6f19eea52c5e.tar.gz emacs-10c7e43106d56781fe23fe0ce02c6f19eea52c5e.zip | |
* vc-hg.el:
* vc-git.el: Require vc-dir when compiling.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-git.el | 1 | ||||
| -rw-r--r-- | lisp/vc-hg.el | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index beb1f727bfb..b48777438c0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -4,6 +4,9 @@ | |||
| 4 | 4 | ||
| 5 | 2008-06-25 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2008-06-25 Dan Nicolaescu <dann@ics.uci.edu> |
| 6 | 6 | ||
| 7 | * vc-hg.el: | ||
| 8 | * vc-git.el: Require vc-dir when compiling. | ||
| 9 | |||
| 7 | * vc-dir.el (vc-dir-marked-only-files-and-states): Rename from | 10 | * vc-dir.el (vc-dir-marked-only-files-and-states): Rename from |
| 8 | vc-dir-marked-only-files. Change the return value. | 11 | vc-dir-marked-only-files. Change the return value. |
| 9 | (vc-dir-child-files-and-states): Rename from vc-dir-child-files. | 12 | (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 @@ | |||
| 107 | (eval-when-compile | 107 | (eval-when-compile |
| 108 | (require 'cl) | 108 | (require 'cl) |
| 109 | (require 'vc) | 109 | (require 'vc) |
| 110 | (require 'vc-dir) | ||
| 110 | (require 'grep)) | 111 | (require 'grep)) |
| 111 | 112 | ||
| 112 | (defvar git-commits-coding-system 'utf-8 | 113 | (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 @@ | |||
| 108 | 108 | ||
| 109 | (eval-when-compile | 109 | (eval-when-compile |
| 110 | (require 'cl) | 110 | (require 'cl) |
| 111 | (require 'vc)) | 111 | (require 'vc) |
| 112 | (require 'vc-dir)) | ||
| 112 | 113 | ||
| 113 | ;;; Customization options | 114 | ;;; Customization options |
| 114 | 115 | ||