Clarify manual and `add-hook' doc string about buffer-local hooks

2 files changed, 10 insertions, 0 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 0102e028d49..e21a02f700f 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,7 @@
+2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * custom.texi (Hooks): Mention buffer-local hooks (bug#6218).
+
 2011-07-13  Glenn Morris  <rgm@gnu.org>
 
         * dired.texi (Dired Enter): Mention --dired.  (Bug#9039)
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index 8465dd93519..6a6d465438d 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -820,6 +820,12 @@ the versions you added will remain in the hook variable together.  You
 can clear out individual functions by calling @code{remove-hook}, or
 do @code{(setq @var{hook-variable} nil)} to remove everything.
 
+@cindex buffer-local hooks
+  If the hook variable is buffer-local, the buffer-local variable will
+be used instead of the global variable.  However, if the buffer-local
+variable contains the element @code{t}, the global hook variable will
+be run as well.
+
 @node Locals
 @subsection Local Variables