diff options
| -rw-r--r-- | lisp/ChangeLog | 10 | ||||
| -rw-r--r-- | lisp/vc-hooks.el | 2 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0e30e7d88f2..fe27f9e37bc 100644 --- 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 f9b82aab497..ed44eba3498 100644 --- 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)." |