diff options
| author | Karoly Lorentey | 2006-01-30 18:06:22 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2006-01-30 18:06:22 +0000 |
| commit | e31331e5cb40d3e56e4160229b33f2dad9d5e4ab (patch) | |
| tree | 29d504a565260e6ba5d2972ec742a25574b7357a /src/data.c | |
| parent | 9688ff534500a278871366f699cd0ead3524b68a (diff) | |
| parent | 75e49434a5b90f797fe9b0250d426793793fb8e7 (diff) | |
| download | emacs-e31331e5cb40d3e56e4160229b33f2dad9d5e4ab.tar.gz emacs-e31331e5cb40d3e56e4160229b33f2dad9d5e4ab.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 187, 704)
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--base-0
tag of miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704
* emacs@sv.gnu.org/emacs--devo--0--patch-1
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-2
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-3
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-4
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-5
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-6
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-7
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-8
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-9
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-10
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-11
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-12
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-13
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-14
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-15
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-16
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-17
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-18
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-19
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-20
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-21
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-22
Install ERC.
* emacs@sv.gnu.org/emacs--devo--0--patch-23
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-24
Fix ERC compiler warnings.
* emacs@sv.gnu.org/emacs--devo--0--patch-25
Use utf-8 encoding in ERC ChangeLogs.
* emacs@sv.gnu.org/emacs--devo--0--patch-26
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-27
Merge ERC-related Viper hacks into Viper.
* emacs@sv.gnu.org/emacs--devo--0--patch-28
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-29
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-30
Merge from erc--main--0
* emacs@sv.gnu.org/gnus--rel--5.10--base-0
tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
* emacs@sv.gnu.org/gnus--rel--5.10--patch-1
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-2
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-3
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-4
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-5
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-6
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-7
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-704
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-501
Diffstat (limited to 'src/data.c')
| -rw-r--r-- | src/data.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/data.c b/src/data.c index 0b2036395da..c70e3219eac 100644 --- a/src/data.c +++ b/src/data.c | |||
| @@ -522,7 +522,10 @@ DEFUN ("floatp", Ffloatp, Sfloatp, 1, 1, 0, | |||
| 522 | 522 | ||
| 523 | DEFUN ("car", Fcar, Scar, 1, 1, 0, | 523 | DEFUN ("car", Fcar, Scar, 1, 1, 0, |
| 524 | doc: /* Return the car of LIST. If arg is nil, return nil. | 524 | doc: /* Return the car of LIST. If arg is nil, return nil. |
| 525 | Error if arg is not nil and not a cons cell. See also `car-safe'. */) | 525 | Error if arg is not nil and not a cons cell. See also `car-safe'. |
| 526 | |||
| 527 | See Info node `(elisp)Cons Cells' for a discussion of related basic | ||
| 528 | Lisp concepts such as car, cdr, cons cell and list. */) | ||
| 526 | (list) | 529 | (list) |
| 527 | register Lisp_Object list; | 530 | register Lisp_Object list; |
| 528 | { | 531 | { |
| @@ -550,7 +553,10 @@ DEFUN ("car-safe", Fcar_safe, Scar_safe, 1, 1, 0, | |||
| 550 | 553 | ||
| 551 | DEFUN ("cdr", Fcdr, Scdr, 1, 1, 0, | 554 | DEFUN ("cdr", Fcdr, Scdr, 1, 1, 0, |
| 552 | doc: /* Return the cdr of LIST. If arg is nil, return nil. | 555 | doc: /* Return the cdr of LIST. If arg is nil, return nil. |
| 553 | Error if arg is not nil and not a cons cell. See also `cdr-safe'. */) | 556 | Error if arg is not nil and not a cons cell. See also `cdr-safe'. |
| 557 | |||
| 558 | See Info node `(elisp)Cons Cells' for a discussion of related basic | ||
| 559 | Lisp concepts such as cdr, car, cons cell and list. */) | ||
| 554 | (list) | 560 | (list) |
| 555 | register Lisp_Object list; | 561 | register Lisp_Object list; |
| 556 | { | 562 | { |