(vc-directory-resynch-file): Fix declaration.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0e30e7d88f2594307bba9880eaf2a31dce488c8b..fe27f9e37bcaf931b52b52299da674532cd2f8bb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2008-05-15  Glenn Morris  <rgm@gnu.org>
+
+       * vc-hooks.el (vc-directory-resynch-file): Fix declaration.
+
+       * org/org-exp.el (org-infojs-options-inbuffer-template):
+       Fix declaration.
+
+       * progmodes/cc-mode.el (declare-function): Add compat definition.
+       (awk-mode-syntax-table, c-awk-unstick-NL-prop): Declare for compiler.
+
 2008-05-14  Eric S. Raymond  <esr@snark.thyrsus.com>
 
        * vc-dispatcher.el (vc-dispatcher-selection): Change the returned

diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index f9b82aab497a78f322e658bd2a3554b0af22d6e3..ed44eba3498fac20cdb0de5328f05457a2bc82cf 100644 (file)
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -745,7 +745,7 @@ Before doing that, check if there are any old backups and get rid of them."
            (vc-call-backend backend 'make-version-backups-p file)
            (vc-make-version-backup file)))))
 
-(declare-function vc-directory-resynch-file "vc" (file))
+(declare-function vc-directory-resynch-file "vc-dispatcher" (&optional fname))
 
 (defun vc-after-save ()
   "Function to be called by `basic-save-buffer' (in files.el)."