aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/loading.texi3
2 files changed, 7 insertions, 2 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7307d7fab4f..6a51b3f506b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12011-01-11 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * loading.texi (Hooks for Loading): Adjust doc of eval-after-load.
4
12011-01-02 Eli Zaretskii <eliz@gnu.org> 52011-01-02 Eli Zaretskii <eliz@gnu.org>
2 6
3 * modes.texi (Emulating Mode Line): Fix last change. 7 * modes.texi (Emulating Mode Line): Fix last change.
@@ -8884,7 +8888,7 @@
8884;; End: 8888;; End:
8885 8889
8886 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 8890 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
8887 2007, 2008, 2009, 2010 Free Software Foundation, Inc. 8891 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
8888 8892
8889 This file is part of GNU Emacs. 8893 This file is part of GNU Emacs.
8890 8894
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index 05d836140c7..11bd48f8a01 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -962,7 +962,8 @@ example, @file{my_inst.elc} or @file{my_inst.elc.gz} in some directory
962@end example 962@end example
963 963
964@var{library} can also be a feature (i.e.@: a symbol), in which case 964@var{library} can also be a feature (i.e.@: a symbol), in which case
965@var{form} is evaluated when @code{(provide @var{library})} is called. 965@var{form} is evaluated at the end of any file where
966@code{(provide @var{library})} is called.
966 967
967An error in @var{form} does not undo the load, but does prevent 968An error in @var{form} does not undo the load, but does prevent
968execution of the rest of @var{form}. 969execution of the rest of @var{form}.