[Emacs-diffs] /srv/bzr/emacs/trunk r105177: * modes.texi (Running Hooks): Mention buffer-local hook variables

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105177
fixes bug(s): http://debbugs.gnu.org/6218
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-13 23:42:54 +0200
message:
  * modes.texi (Running Hooks): Mention buffer-local hook variables
modified:
  doc/lispref/ChangeLog
  doc/lispref/modes.texi

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-07-13 15:07:57 +0000
+++ b/doc/lispref/ChangeLog     2011-07-13 21:42:54 +0000
@@ -1,5 +1,8 @@
 2011-07-13  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * modes.texi (Running Hooks): Mention buffer-local hook variables
+       (bug#6218).
+
        * objects.texi (General Escape Syntax): "a with grave accent" is
        ?xe0, not ?x8e0 (bug#5259).
 

=== modified file 'doc/lispref/modes.texi'
--- a/doc/lispref/modes.texi    2011-07-10 15:12:36 +0000
+++ b/doc/lispref/modes.texi    2011-07-13 21:42:54 +0000
@@ -101,6 +101,11 @@
 The hook variable's value can also be a single function---either a
 lambda expression or a symbol with a function definition---which
 @code{run-hooks} calls.  But this usage is obsolete.
+
+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.
 @end defun
 
 @defun run-hook-with-args hook &rest args
@@ -169,11 +174,11 @@
 value is a single function; it sets or changes the value to a list of
 functions.
 
-If @var{local} is address@hidden, that says to add @var{function} to
-the buffer-local hook list instead of to the global hook list.  If
-needed, this makes the hook buffer-local and adds @code{t} to the
-buffer-local value.  The latter acts as a flag to run the hook
-functions in the default value as well as in the local value.
+If @var{local} is address@hidden, that says to add @var{function} to the
+buffer-local hook list instead of to the global hook list.  This makes
+the hook buffer-local and adds @code{t} to the buffer-local value.  The
+latter acts as a flag to run the hook functions in the default value as
+well as in the local value.
 @end defun
 
 @defun remove-hook hook function &optional local