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

2 files changed, 7 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 41a7f0b1d2e..be42c4b8b2a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2011-07-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+        * subr.el (add-hook): Clarify section about buffer-local hooks
+        (bug#6218).
+
         * dired.el (dired-flagged): Clarify doc string (bug#6117).
 
 2011-07-13  Juanma Barranquero  <lekktu@gmail.com>
diff --git a/lisp/subr.el b/lisp/subr.el
index 5c9d6c8d724..a2f560461eb 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1262,10 +1262,10 @@ unless the optional argument APPEND is non-nil, in which case
 FUNCTION is added at the end.
 
 The optional fourth argument, LOCAL, if non-nil, says to modify
-the hook's buffer-local value rather than its default value.
-This makes the hook buffer-local if needed, and it makes t a member
-of the buffer-local value.  That acts as a flag to run the hook
-functions in the default value as well as in the local value.
+the hook's buffer-local value rather than its global value.
+This makes the hook buffer-local, and it makes t a member of the
+buffer-local value.  That acts as a flag to run the hook
+functions of the global value as well as in the local value.
 
 HOOK should be a symbol, and FUNCTION may be any valid function.  If
 HOOK is void, it is first set to nil.  If HOOK's value is a single