2 files changed, 14 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 452a9847f6c..ae7927296f6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-11-22  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/check-declare.el (check-declare-locate): New function.
+        (check-declare-scan): Use check-declare-locate.
+        (check-declare-verify): No longer adjust fnfile, now
+        check-declare-locate does it.
+
+        * emacs-lisp/byte-run.el (declare-function): Doc fix.
+
 2007-11-22  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * subr.el (posn-col-row): Make the `default-value' use explicit.
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 2ba708d9c92..9a516b9d36e 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -112,10 +112,11 @@ definition for FN.  ARGLIST is used by both the byte-compiler and
 `check-declare' to check for consistency.
 
 FILE can be either a Lisp file (in which case the \".el\"
-extension is optional), or a C file.  FILE should be either
-absolute, or relative to the location of the file containing the
-declaration (for a Lisp file), or to the Emacs \"src/\" directory
-\(for a C file).
+extension is optional), or a C file.  C files are expanded
+relative to the Emacs \"src/\" directory.  Lisp files are
+searched for using `locate-library', and if that fails they are
+expanded relative to the location of the file containing the
+declaration.
 
 Note that for the purposes of `check-declare', this statement
 must be the first non-whitespace on a line, and everything up to