diff options
author | Miles Bader <miles@gnu.org> | 2007-07-24 01:25:28 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-07-24 01:25:28 +0000 |
commit | 492d9f3e3ccd2b640958e840caa451e9e04e86db (patch) | |
tree | c87779daf272535b621216ef05179fa48102e57e /src/data.c | |
parent | 7eb1e4534e88a32fe5e549e630fdabf3e062be2b (diff) | |
parent | 1e8995158740b15936887264a3d7183beb5c51d9 (diff) | |
download | emacs-492d9f3e3ccd2b640958e840caa451e9e04e86db.tar.gz emacs-492d9f3e3ccd2b640958e840caa451e9e04e86db.tar.bz2 emacs-492d9f3e3ccd2b640958e840caa451e9e04e86db.zip |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 814-823)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 59-69)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 237-238)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-26
Diffstat (limited to 'src/data.c')
-rw-r--r-- | src/data.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/data.c b/src/data.c index b31900f9c0c..3e58fb00c3d 100644 --- a/src/data.c +++ b/src/data.c @@ -1452,7 +1452,7 @@ More generally, you can use multiple variables and values, as in This sets each VAR's default value to the corresponding VALUE. The VALUE for the Nth VAR can refer to the new default values of previous VARs. -usage: (setq-default [VAR VALUE...]) */) +usage: (setq-default [VAR VALUE]...) */) (args) Lisp_Object args; { @@ -2406,7 +2406,9 @@ DEFUN ("zerop", Fzerop, Szerop, 1, 1, 0, return Qnil; } -/* Convert between long values and pairs of Lisp integers. */ +/* Convert between long values and pairs of Lisp integers. + Note that long_to_cons returns a single Lisp integer + when the value fits in one. */ Lisp_Object long_to_cons (i) |