Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 414-422)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 128-130)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108

8 files changed, 89 insertions, 7 deletions

diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index cc3ccac3c7a..78e5e6d88cf 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,3 +1,44 @@
+2006-09-04  Richard Stallman  <rms@gnu.org>
+
+        * processes.texi (Accepting Output): Explain SECONDS=0 for
+        accept-process-output.
+
+        * os.texi (Idle Timers): Explain why timer functions should not
+        loop until (input-pending-p).
+
+2006-09-02  Eli Zaretskii  <eliz@gnu.org>
+
+        * makefile.w32-in (usermanualdir): New variable.
+        (elisp.dvi): Use it.
+
+2006-09-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * buffers.texi (Buffer Modification): Fix last change.
+
+2006-09-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * buffers.texi (Buffer Modification): Document
+        buffer-chars-modified-tick.
+
+2006-08-31  Richard Stallman  <rms@gnu.org>
+
+        * modes.texi (Syntactic Font Lock): Mention specific faces once again.
+
+2006-08-31  Richard Bielawski  <RBielawski@moneygram.com>  (tiny change)
+
+        * modes.texi (Syntactic Font Lock):
+        Mention font-lock-syntactic-face-function
+        instead of specific faces.
+
+2006-08-29  Chong Yidong  <cyd@stupidchicken.com>
+
+        * display.texi (Images): Add xrref to display-images-p.
+
+2006-08-28  Kenichi Handa  <handa@m17n.org>
+
+        * nonascii.texi (Lisp and Coding Systems): Fix description of
+        detect-coding-region.
+
 2006-08-27  Michael Olson  <mwolson@gnu.org>
 
         * processes.texi (Transaction Queues): Remove stray quote
diff --git a/lispref/buffers.texi b/lispref/buffers.texi
index 46a886eaea6..3b9750f00a2 100644
--- a/lispref/buffers.texi
+++ b/lispref/buffers.texi
@@ -573,7 +573,6 @@ Don't use this function in programs, since it prints a message in the
 echo area; use @code{set-buffer-modified-p} (above) instead.
 @end deffn
 
-@c Emacs 19 feature
 @defun buffer-modified-tick &optional buffer
 This function returns @var{buffer}'s modification-count.  This is a
 counter that increments every time the buffer is modified.  If
@@ -581,6 +580,17 @@ counter that increments every time the buffer is modified.  If
 The counter can wrap around occasionally.
 @end defun
 
+@defun buffer-chars-modified-tick &optional buffer
+This function returns @var{buffer}'s character-change modification-count.
+Changes to text properties leave this counter unchanged; however, each
+time text is inserted or removed from the buffer, the counter is reset
+to the value that would be returned @code{buffer-modified-tick}.
+By comparing the values returned by two @code{buffer-chars-modified-tick}
+calls, you can tell whether a character change occurred in that buffer
+in between the calls.  If @var{buffer} is @code{nil} (or omitted), the
+current buffer is used.
+@end defun
+
 @node Modification Time
 @comment  node-name,  next,  previous,  up
 @section Comparison of Modification Time
diff --git a/lispref/display.texi b/lispref/display.texi
index e762c14a7f0..5865f9c6854 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -3564,6 +3564,13 @@ If @var{window} is @code{nil}, the selected window is used.
 descriptor, then use it as a display specifier in the @code{display}
 property of text that is displayed (@pxref{Display Property}).
 
+  Emacs is usually able to display images when it is run on a
+graphical terminal.  Images cannot be displayed in a text terminal, on
+certain graphical terminals that lack the support for this, or if
+Emacs is compiled without image support.  You can use the function
+@code{display-images-p} to determine if images can in principle be
+displayed (@pxref{Display Feature Testing}).
+
   Emacs can display a number of different image formats; some of them
 are supported only if particular support libraries are installed on
 your machine.  In some environments, Emacs can load image
diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in
index 0b4c080b956..7da88058bd5 100644
--- a/lispref/makefile.w32-in
+++ b/lispref/makefile.w32-in
@@ -23,6 +23,7 @@
 srcdir = .
 
 infodir = $(srcdir)/../info
+usermanualdir = $(srcdir)/../man
 
 # Redefine `TEX' if `tex' does not invoke plain TeX.  For example:
 # TEX=platex
@@ -108,7 +109,7 @@ $(infodir)/elisp: $(srcs)
         $(MAKEINFO) -I. -I$(srcdir) -o $(infodir)/elisp $(srcdir)/elisp.texi
 
 elisp.dvi: $(srcs)
-        $(texinputdir) $(TEX) $(srcdir)/elisp.texi
+        $(texinputdir) $(TEX) -I $(usermanualdir) $(srcdir)/elisp.texi
 
 clean:
         - $(DEL) *.toc *.aux *.log *.cp *.cps *.fn *.fns *.tp *.tps \
diff --git a/lispref/modes.texi b/lispref/modes.texi
index f8afcd8a829..68aeace5c38 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -2897,9 +2897,10 @@ directives in C.
 Syntactic fontification uses the syntax table to find comments and
 string constants (@pxref{Syntax Tables}).  It highlights them using
 @code{font-lock-comment-face} and @code{font-lock-string-face}
-(@pxref{Faces for Font Lock}).  There are several variables that
-affect syntactic fontification; you should set them by means of
-@code{font-lock-defaults} (@pxref{Font Lock Basics}).
+(@pxref{Faces for Font Lock}), or whatever
+@code{font-lock-syntactic-face-function} chooses.  There are several
+variables that affect syntactic fontification; you should set them by
+means of @code{font-lock-defaults} (@pxref{Font Lock Basics}).
 
 @defvar font-lock-keywords-only
 Non-@code{nil} means Font Lock should not do syntactic fontification;
diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi
index b22a162bb2e..ba001ca72db 100644
--- a/lispref/nonascii.texi
+++ b/lispref/nonascii.texi
@@ -882,8 +882,9 @@ decreasing priority.  But if @var{highest} is non-@code{nil}, then the
 return value is just one coding system, the one that is highest in
 priority.
 
-If the region contains only @acronym{ASCII} characters, the value
-is @code{undecided} or @code{(undecided)}, or a variant specifying
+If the region contains only @acronym{ASCII} characters except for such
+ISO-2022 control characters ISO-2022 as @code{ESC}, the value is
+@code{undecided} or @code{(undecided)}, or a variant specifying
 end-of-line conversion, if that can be deduced from the text.
 @end defun
 
diff --git a/lispref/os.texi b/lispref/os.texi
index f6682548e5b..edf5833bf42 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -1578,6 +1578,25 @@ Here's an example:
 @end smallexample
 @end defun
 
+  Some idle timer functions in user Lisp packages have a loop that
+does a certain amount of processing each time around, and exits when
+@code{(input-pending-p)} is non-@code{nil}.  That approach seems very
+natural but has two problems:
+
+@itemize
+@item
+It blocks out all process output (since Emacs accepts process output
+only while waiting).
+
+@item
+It blocks out any idle timers that ought to run during that time.
+@end itemize
+
+@noindent
+To avoid these problems, don't use that technique.  Instead, write
+such idle timers to reschedule themselves after a brief pause, using
+the method in the @code{timer-function} example above.
+
 @node Terminal Input
 @section Terminal Input
 @cindex terminal input
diff --git a/lispref/processes.texi b/lispref/processes.texi
index f957ebcac4b..dbc2486f5f6 100644
--- a/lispref/processes.texi
+++ b/lispref/processes.texi
@@ -1308,6 +1308,8 @@ subprocess output.
 
 The argument @var{seconds} need not be an integer.  If it is a floating
 point number, this function waits for a fractional number of seconds.
+If @var{seconds} is 0, the function accepts whatever output is
+pending but does not wait.
 
 @c Emacs 22.1 feature
 If @var{process} is a process, and the argument @var{just-this-one} is