2 files changed, 10 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index de0839bd1a2..7c246635258 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2009-10-01  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/check-declare.el (check-declare-scan): Read the declaration
+        rather than parsing it as a regexp.  This relaxes the layout
+        requirements and makes errors easier to detect.
+        (check-declare-verify): Check file is regular.
+        (check-declare-directory): Doc fix.
+        * subr.el (declare-function): Doc fix.
+
 2009-10-01  Juanma Barranquero  <lekktu@gmail.com>
 
         * cedet/semantic/wisent/javat-wy.el
diff --git a/lisp/subr.el b/lisp/subr.el
index ac8743e683e..a7d3fcd600c 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -62,11 +62,7 @@ set ARGLIST to `t'.  This is necessary because `nil' means an
 empty argument list, rather than an unspecified one.
 
 Note that for the purposes of `check-declare', this statement
-must be the first non-whitespace on a line, and everything up to
-the end of FILE must be all on the same line.  For example:
-
-\(declare-function c-end-of-defun \"progmodes/cc-cmds.el\"
-                  \(&optional arg))
+must be the first non-whitespace on a line.
 
 For more information, see Info node `(elisp)Declaring Functions'."
   ;; Does nothing - byte-compile-declare-function does the work.