Index: text.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/man/text.texi,v
retrieving revision 1.57
diff -u -c -r1.57 text.texi
cvs server: conflicting specifications of output style
*** text.texi	15 Aug 2005 01:47:46 -0000	1.57
--- text.texi	29 Aug 2005 23:18:40 -0000
***************
*** 577,587 ****
  @code{t} to tell the sentence commands that a period is not necessary.
  
  @vindex fill-nobreak-predicate
!   The variable @code{fill-nobreak-predicate} specifies additional
! conditions for where line-breaking is allowed.  Its value is either
! @code{nil} or a Lisp function; the function is called with no
! arguments, and if it returns a address@hidden value, then point is not
! a good place to break the line.  Two standard functions you can use are
  @code{fill-single-word-nobreak-p} (don't break after the first word of
  a sentence or before the last) and @code{fill-french-nobreak-p} (don't
  break after @samp{(} or before @samp{)}, @samp{:} or @samp{?}).
--- 577,587 ----
  @code{t} to tell the sentence commands that a period is not necessary.
  
  @vindex fill-nobreak-predicate
!   The variable @code{fill-nobreak-predicate} is a hook (an abnormal
! hook, @pxref{Hooks}) specifying additional conditions where
! line-breaking is not allowed.  Each function is called with no
! arguments and should return a address@hidden value if point is not a
! good place to break the line.  Two standard functions you can use are
  @code{fill-single-word-nobreak-p} (don't break after the first word of
  a sentence or before the last) and @code{fill-french-nobreak-p} (don't
  break after @samp{(} or before @samp{)}, @samp{:} or @samp{?}).