diff options
| author | Miles Bader | 2007-08-13 13:51:08 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-08-13 13:51:08 +0000 |
| commit | aaf34461ff5804e5cebe163b31e535da72e81d87 (patch) | |
| tree | b096310b459b78e437f08ac0f1f00954840a5db5 /src/eval.c | |
| parent | 61d032dfd91b811d59acd7605ac02758be97e912 (diff) | |
| parent | 37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff) | |
| download | emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.tar.gz emacs-aaf34461ff5804e5cebe163b31e535da72e81d87.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--multi-tty--0--patch-31
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 9a03e5fac83..13ea0ba7ebf 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -1793,7 +1793,7 @@ signal_error (s, arg) | |||
| 1793 | } | 1793 | } |
| 1794 | 1794 | ||
| 1795 | 1795 | ||
| 1796 | /* Return nonzero iff LIST is a non-nil atom or | 1796 | /* Return nonzero if LIST is a non-nil atom or |
| 1797 | a list containing one of CONDITIONS. */ | 1797 | a list containing one of CONDITIONS. */ |
| 1798 | 1798 | ||
| 1799 | static int | 1799 | static int |