diff options
| author | Miles Bader | 2007-08-13 13:48:35 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-13 13:48:35 +0000 |
| commit | b2e6b10fe2d40020a75ab0025af98a4abf339cd2 (patch) | |
| tree | db265e5ea93cdc13f8e3b54ed5c7ad2869d50ec9 /src/eval.c | |
| parent | 905350bef3ebc514a418658dd155c1d062664b56 (diff) | |
| parent | 37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff) | |
| download | emacs-b2e6b10fe2d40020a75ab0025af98a4abf339cd2.tar.gz emacs-b2e6b10fe2d40020a75ab0025af98a4abf339cd2.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-246
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c index 78316eb1a3c..6ce64bc4d8c 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1783,7 +1783,7 @@ signal_error (s, arg) | |||
| 1783 | } | 1783 | } |
| 1784 | 1784 | ||
| 1785 | 1785 | ||
| 1786 | /* Return nonzero iff LIST is a non-nil atom or | 1786 | /* Return nonzero if LIST is a non-nil atom or |
| 1787 | a list containing one of CONDITIONS. */ | 1787 | a list containing one of CONDITIONS. */ |
| 1788 | 1788 | ||
| 1789 | static int | 1789 | static int |