Merge from mh-e; up to 2012-01-03T19:41:14Z!larsi@gnus.org.

[bpt/emacs.git] / doc / lispref / errors.texi

diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi
index b92fd9e..e00496e 100644 (file)
--- a/doc/lispref/errors.texi
+++ b/doc/lispref/errors.texi
@@ -1,17 +1,17 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990-1993, 1999, 2001-2012 Free Software Foundation, Inc.
+@c Copyright (C) 1990-1993, 1999, 2001-2014 Free Software Foundation,
+@c Inc.
 @c See the file elisp.texi for copying conditions.
 @node Standard Errors
 @appendix Standard Errors
 @cindex standard errors
 
-  Here is a list of the more important error symbols in standard Emacs,
-grouped by concept.  The list includes each symbol's message (on the
-@code{error-message} property of the symbol) and a cross reference to a
-description of how the error can occur.
+  Here is a list of the more important error symbols in standard Emacs, grouped
+by concept.  The list includes each symbol's message and a cross reference
+to a description of how the error can occur.
 
-  Each error symbol has an @code{error-conditions} property that is a
+  Each error symbol has an set of parent error conditions that is a
 list of symbols.  Normally this list includes the error symbol itself
 and the symbol @code{error}.  Occasionally it includes additional
 symbols, which are intermediate classifications, narrower than
@@ -23,8 +23,6 @@ conditions, that means it has none.
   As a special exception, the error symbol @code{quit} does not have the
 condition @code{error}, because quitting is not considered an error.
 
-@c You can grep for "(put 'foo 'error-conditions ...) to find
-@c examples defined in Lisp.  Eg soap-client.el, sasl.el.
   Most of these error symbols are defined in C (mainly @file{data.c}),
 but some are defined in Lisp.  For example, the file @file{userlock.el}
 defines the @code{file-locked} and @code{file-supersession} errors.
@@ -91,7 +89,7 @@ The message is @samp{End of buffer}.  @xref{Character Motion}.
 @item end-of-file
 The message is @samp{End of file during parsing}.  Note that this is
 not a subcategory of @code{file-error}, because it pertains to the
-Lisp reader, not to file I/O.  @xref{Input Functions}.
+Lisp reader, not to file I/O@.  @xref{Input Functions}.
 
 @item file-already-exists
 This is a subcategory of @code{file-error}.  @xref{Writing to Files}.
@@ -122,6 +120,11 @@ This is a subcategory of @code{file-error}.  @xref{File Locks}.
 @item file-supersession
 This is a subcategory of @code{file-error}.  @xref{Modification Time}.
 
+@c filenotify.el
+@item file-notify-error
+This is a subcategory of @code{file-error}.  It happens, when a file
+could not be watched for changes.  @xref{File Notifications}.
+
 @c net/ange-ftp.el
 @item ftp-error
 This is a subcategory of @code{file-error}, which results from