(eval-after-load): Doc fix.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9bde54d..9be445a 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-06  Glenn Morris  <rgm@gnu.org>
+
+       * ffap.el (ffap-version): Make it an obsolete alias for emacs-version.
+       (top-level): Move provide to the end.
+       (ffap): Remove defunct URL from custom group.
+
+       * subr.el (eval-after-load): Doc fix.
+
 2009-07-06  Vincent Belaïche <vincent.belaiche@gmail.com>
 
        * calc/calc-embed.el (calc-embedded-make-info): Don't force when

diff --git a/lisp/subr.el b/lisp/subr.el
index 6ca2284..6d81f1c 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1615,7 +1615,11 @@ extension for a compressed format \(e.g. \".gz\") on FILE will not affect
 this name matching.
 
 Alternatively, FILE can be a feature (i.e. a symbol), in which case FORM
-is evaluated whenever that feature is `provide'd.
+is evaluated whenever that feature is `provide'd.  Note that although
+provide statements are usually at the end of files, this is not always
+the case (e.g., sometimes they are at the start to avoid a recursive
+load error).  If your FORM should not be evaluated until the code in
+FILE has been, do not use the symbol form for FILE in such cases.
 
 Usually FILE is just a library name like \"font-lock\" or a feature name
 like 'font-lock.