diff options
| author | Dan Nicolaescu | 2008-05-10 19:21:30 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-05-10 19:21:30 +0000 |
| commit | d9a3d80e56e26f65ca3b35b242436a2b16dbf535 (patch) | |
| tree | 9797ca6ab5e19b848638d81aef70e93a4a141f16 | |
| parent | ec4149ff60687d7acba5435e33cc0365e0c5738a (diff) | |
| download | emacs-d9a3d80e56e26f65ca3b35b242436a2b16dbf535.tar.gz emacs-d9a3d80e56e26f65ca3b35b242436a2b16dbf535.zip | |
(vc-hooks, ewoc): Require.
(vc-log-edit, vc-buffer-sync): Declare for byte compiler.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-dispatcher.el | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d01ac403401..b58775e6396 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2008-05-10 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2008-05-10 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * vc-dispatcher.el (vc-hooks, ewoc): Require. | ||
| 4 | (vc-log-edit, vc-buffer-sync): Declare for byte compiler. | ||
| 5 | |||
| 3 | * vc-hg.el (vc-hg-diff, vc-hg-annotate-command): Use when not if. | 6 | * vc-hg.el (vc-hg-diff, vc-hg-annotate-command): Use when not if. |
| 4 | 7 | ||
| 5 | 2008-05-10 Chong Yidong <cyd@stupidchicken.com> | 8 | 2008-05-10 Chong Yidong <cyd@stupidchicken.com> |
diff --git a/lisp/vc-dispatcher.el b/lisp/vc-dispatcher.el index 3a1de2575fb..dd79b555cf6 100644 --- a/lisp/vc-dispatcher.el +++ b/lisp/vc-dispatcher.el | |||
| @@ -120,11 +120,15 @@ | |||
| 120 | ;; - vc-dir-menu-map-filter hook call needs to be moved to vc.el. | 120 | ;; - vc-dir-menu-map-filter hook call needs to be moved to vc.el. |
| 121 | ;; | 121 | ;; |
| 122 | 122 | ||
| 123 | (provide 'vc-dispatcher) | 123 | (require 'vc-hooks) |
| 124 | (require 'ewoc) | ||
| 124 | 125 | ||
| 125 | (eval-when-compile | 126 | (eval-when-compile |
| 126 | (require 'cl)) | 127 | (require 'cl)) |
| 127 | 128 | ||
| 129 | (declare-function vc-log-edit "vc" (fileset)) | ||
| 130 | (declare-function vc-buffer-sync "vc" (&optional not-urgent)) | ||
| 131 | |||
| 128 | ;; General customization | 132 | ;; General customization |
| 129 | 133 | ||
| 130 | (defcustom vc-logentry-check-hook nil | 134 | (defcustom vc-logentry-check-hook nil |
| @@ -1355,5 +1359,7 @@ containing that file. Otherwise, throw an error." | |||
| 1355 | nil (lambda () (vc-dispatcher-in-fileset-p files)))) | 1359 | nil (lambda () (vc-dispatcher-in-fileset-p files)))) |
| 1356 | files)) | 1360 | files)) |
| 1357 | 1361 | ||
| 1362 | (provide 'vc-dispatcher) | ||
| 1363 | |||
| 1358 | ;; arch-tag: 7d08b17f-5470-4799-914b-bfb9fcf6a246 | 1364 | ;; arch-tag: 7d08b17f-5470-4799-914b-bfb9fcf6a246 |
| 1359 | ;;; vc-dispatcher.el ends here | 1365 | ;;; vc-dispatcher.el ends here |