aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-01-02 11:17:48 -0800
committerGlenn Morris2014-01-02 11:17:48 -0800
commit33f846fbbb099b89c288d450333aa6e90ed8f334 (patch)
tree300cfedf3285991b2c8b82c8fafce8b1068108e4
parent44c5e192bebd669e687423145cb4949567f64314 (diff)
downloademacs-33f846fbbb099b89c288d450333aa6e90ed8f334.tar.gz
emacs-33f846fbbb099b89c288d450333aa6e90ed8f334.zip
* doc/lispref/numbers.texi (Numeric Conversions): Fix a typo.
Also some ChangeLog fixes.
-rw-r--r--doc/lispref/ChangeLog18
-rw-r--r--doc/lispref/numbers.texi2
2 files changed, 9 insertions, 11 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index b9e0fb9199d..6df7f1416c9 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
12014-01-02 Glenn Morris <rgm@gnu.org>
2
3 * numbers.texi (Numeric Conversions): Fix a typo.
4
12013-12-29 Paul Eggert <eggert@cs.ucla.edu> 52013-12-29 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Plain copy-file no longer chmods an existing destination (Bug#16133). 7 Plain copy-file no longer chmods an existing destination (Bug#16133).
@@ -1355,14 +1359,16 @@
1355 Tweak markup. Remove domain-error and friends, which seem to be 1359 Tweak markup. Remove domain-error and friends, which seem to be
1356 unused after the floating-point code revamp. 1360 unused after the floating-point code revamp.
1357 1361
1358 * functions.texi (Obsolete Functions): Obsolescence also affects 1362 * functions.texi (Defining Functions): defun is now a macro.
1363 (Obsolete Functions): Obsolescence also affects
1359 documentation commands. Various clarifications. 1364 documentation commands. Various clarifications.
1360 (Declare Form): New node. 1365 (Declare Form): New node.
1361 1366
1362 * strings.texi (String Basics): Copyedits. 1367 * strings.texi (String Basics): Copyedits.
1363 1368
1364 * os.texi (Idle Timers): Minor clarifications. 1369 * os.texi (Startup Summary): Document leim-list.el change.
1365 (User Identification): Add system-users and system-groups. 1370 (User Identification): Add system-users and system-groups.
1371 (Idle Timers): Minor clarifications.
1366 1372
1367 * macros.texi (Defining Macros): Move description of `declare' to 1373 * macros.texi (Defining Macros): Move description of `declare' to
1368 Declare Form node. 1374 Declare Form node.
@@ -1378,14 +1384,6 @@
1378 the machine-independence of negative division since it does not 1384 the machine-independence of negative division since it does not
1379 happen in practice. 1385 happen in practice.
1380 1386
13812012-09-28 Chong Yidong <cyd@gnu.org>
1382
1383 * os.texi (Startup Summary): Document leim-list.el change.
1384
13852012-09-25 Chong Yidong <cyd@gnu.org>
1386
1387 * functions.texi (Defining Functions): defun is now a macro.
1388
13892012-09-28 Leo Liu <sdl.web@gmail.com> 13872012-09-28 Leo Liu <sdl.web@gmail.com>
1390 1388
1391 * files.texi (Files): Fix typo. 1389 * files.texi (Files): Fix typo.
diff --git a/doc/lispref/numbers.texi b/doc/lispref/numbers.texi
index 5bff56e4cee..2e8fefed1c5 100644
--- a/doc/lispref/numbers.texi
+++ b/doc/lispref/numbers.texi
@@ -447,7 +447,7 @@ may be integers or floating point numbers. @var{divisor} may also be
447functions convert @var{number} to an integer, or return it unchanged 447functions convert @var{number} to an integer, or return it unchanged
448if it already is an integer. If @var{divisor} is non-@code{nil}, they 448if it already is an integer. If @var{divisor} is non-@code{nil}, they
449divide @var{number} by @var{divisor} and convert the result to an 449divide @var{number} by @var{divisor} and convert the result to an
450integer. integer. If @var{divisor} is zero (whether integer or 450integer. If @var{divisor} is zero (whether integer or
451floating-point), Emacs signals an @code{arith-error} error. 451floating-point), Emacs signals an @code{arith-error} error.
452 452
453@defun truncate number &optional divisor 453@defun truncate number &optional divisor