diff options
| author | Xue Fuqiao | 2013-08-10 06:34:05 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-08-10 06:34:05 +0800 |
| commit | 4517cbc2eafda2f636c677d9e172c09783a0ada2 (patch) | |
| tree | e3036e83fe7240d0cdb9df6619923f88f090c0aa | |
| parent | 54bd972f159fb8c25b4f4042ac6db5da557d9108 (diff) | |
| download | emacs-4517cbc2eafda2f636c677d9e172c09783a0ada2.tar.gz emacs-4517cbc2eafda2f636c677d9e172c09783a0ada2.zip | |
* doc/lispref/control.texi (Error Symbols): Minor fix for previous change.
| -rw-r--r-- | doc/lispref/ChangeLog | 4 | ||||
| -rw-r--r-- | doc/lispref/control.texi | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 611badcbaa0..5d140f72dbf 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2013-08-09 Xue Fuqiao <xfq.free@gmail.com> | ||
| 2 | |||
| 3 | * control.texi (Error Symbols): Minor fix for previous change. | ||
| 4 | |||
| 1 | 2013-08-09 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2013-08-09 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * errors.texi (Standard Errors): Don't refer to `error-conditions'. | 7 | * errors.texi (Standard Errors): Don't refer to `error-conditions'. |
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index b68f3184394..70eabcd84a4 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi | |||
| @@ -1282,9 +1282,10 @@ This parent defines the conditions that this kind of error belongs to. | |||
| 1282 | The transitive set of parents always includes the error symbol itself, and the | 1282 | The transitive set of parents always includes the error symbol itself, and the |
| 1283 | symbol @code{error}. Because quitting is not considered an error, the set of | 1283 | symbol @code{error}. Because quitting is not considered an error, the set of |
| 1284 | parents of @code{quit} is just @code{(quit)}. | 1284 | parents of @code{quit} is just @code{(quit)}. |
| 1285 | @end defun | ||
| 1285 | 1286 | ||
| 1286 | @cindex peculiar error | 1287 | @cindex peculiar error |
| 1287 | In addition to its parents, the error symbol has a var{message} which | 1288 | In addition to its parents, the error symbol has a @var{message} which |
| 1288 | is a string to be printed when that error is signaled but not handled. If that | 1289 | is a string to be printed when that error is signaled but not handled. If that |
| 1289 | message is not valid, the error message @samp{peculiar error} is used. | 1290 | message is not valid, the error message @samp{peculiar error} is used. |
| 1290 | @xref{Definition of signal}. | 1291 | @xref{Definition of signal}. |