aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKarl Berry2006-07-16 18:25:23 +0000
committerKarl Berry2006-07-16 18:25:23 +0000
commitece35e15a7e73189b45b7c2d2fddcd6f46b0476f (patch)
treea785493e0cb209c32b27d5eac2a6fe1ec144ee03
parent912c723552fdb9ff934d768e032b56c23911f2ab (diff)
downloademacs-ece35e15a7e73189b45b7c2d2fddcd6f46b0476f.tar.gz
emacs-ece35e15a7e73189b45b7c2d2fddcd6f46b0476f.zip
fix bad page breaks
-rw-r--r--lispref/ChangeLog3
-rw-r--r--lispref/hash.texi1
-rw-r--r--lispref/lists.texi8
-rw-r--r--lispref/numbers.texi7
-rw-r--r--lispref/objects.texi2
-rw-r--r--lispref/strings.texi13
6 files changed, 19 insertions, 15 deletions
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index ab74a2d4352..3a6818c46e2 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,5 +1,8 @@
12006-07-16 Karl Berry <karl@gnu.org> 12006-07-16 Karl Berry <karl@gnu.org>
2 2
3 * objects.texi, numbers.texi, strings.texi, lists.texi, hash.texi:
4 fix bad page breaks through chapter 7 (hash.texi).
5
3 * anti.texi (Antinews): reorder face-attribute fns to avoid 6 * anti.texi (Antinews): reorder face-attribute fns to avoid
4 underfull hbox. 7 underfull hbox.
5 8
diff --git a/lispref/hash.texi b/lispref/hash.texi
index 1913905af8d..bcc9957228a 100644
--- a/lispref/hash.texi
+++ b/lispref/hash.texi
@@ -269,7 +269,6 @@ compared case-insensitively.
269@example 269@example
270(defun case-fold-string= (a b) 270(defun case-fold-string= (a b)
271 (compare-strings a nil nil b nil nil t)) 271 (compare-strings a nil nil b nil nil t))
272
273(defun case-fold-string-hash (a) 272(defun case-fold-string-hash (a)
274 (sxhash (upcase a))) 273 (sxhash (upcase a)))
275 274
diff --git a/lispref/lists.texi b/lispref/lists.texi
index 7de4a6c6ab0..17d3ebc6c44 100644
--- a/lispref/lists.texi
+++ b/lispref/lists.texi
@@ -1412,8 +1412,8 @@ the value @code{cones}; the key @code{oak} is associated with
1412@end group 1412@end group
1413@end example 1413@end example
1414 1414
1415 The associated values in an alist may be any Lisp objects; so may the 1415 Both the values and the keys in an alist may be any Lisp objects.
1416keys. For example, in the following alist, the symbol @code{a} is 1416For example, in the following alist, the symbol @code{a} is
1417associated with the number @code{1}, and the string @code{"b"} is 1417associated with the number @code{1}, and the string @code{"b"} is
1418associated with the @emph{list} @code{(2 3)}, which is the @sc{cdr} of 1418associated with the @emph{list} @code{(2 3)}, which is the @sc{cdr} of
1419the alist element: 1419the alist element:
@@ -1439,7 +1439,7 @@ below) to find the element containing a given value. When neither of
1439these considerations is important, the choice is a matter of taste, as 1439these considerations is important, the choice is a matter of taste, as
1440long as you are consistent about it for any given alist. 1440long as you are consistent about it for any given alist.
1441 1441
1442 Note that the same alist shown above could be regarded as having the 1442 The same alist shown above could be regarded as having the
1443associated value in the @sc{cdr} of the element; the value associated 1443associated value in the @sc{cdr} of the element; the value associated
1444with @code{rose} would be the list @code{(red)}. 1444with @code{rose} would be the list @code{(red)}.
1445 1445
@@ -1557,7 +1557,7 @@ For example:
1557 @result{} nil 1557 @result{} nil
1558@end smallexample 1558@end smallexample
1559 1559
1560Note that @code{rassq} cannot search for a value stored in the @sc{car} 1560@code{rassq} cannot search for a value stored in the @sc{car}
1561of the @sc{cdr} of an element: 1561of the @sc{cdr} of an element:
1562 1562
1563@smallexample 1563@smallexample
diff --git a/lispref/numbers.texi b/lispref/numbers.texi
index bac3b0e114c..6e0de2007d4 100644
--- a/lispref/numbers.texi
+++ b/lispref/numbers.texi
@@ -606,12 +606,11 @@ otherwise, it signals an @code{arith-error} error.
606 @result{} 2.5 606 @result{} 2.5
607(/ 25 3 2) 607(/ 25 3 2)
608 @result{} 4 608 @result{} 4
609@group
609(/ -17 6) 610(/ -17 6)
610 @result{} -2 611 @result{} -2 @r{(could in theory be @minus{}3 on some machines)}
612@end group
611@end example 613@end example
612
613The result of @code{(/ -17 6)} could in principle be -3 on some
614machines.
615@end defun 614@end defun
616 615
617@defun % dividend divisor 616@defun % dividend divisor
diff --git a/lispref/objects.texi b/lispref/objects.texi
index 3b51b96c780..f708ab79f5e 100644
--- a/lispref/objects.texi
+++ b/lispref/objects.texi
@@ -1822,12 +1822,14 @@ This function returns a symbol naming the primitive type of
1822@example 1822@example
1823(type-of 1) 1823(type-of 1)
1824 @result{} integer 1824 @result{} integer
1825@group
1825(type-of 'nil) 1826(type-of 'nil)
1826 @result{} symbol 1827 @result{} symbol
1827(type-of '()) ; @r{@code{()} is @code{nil}.} 1828(type-of '()) ; @r{@code{()} is @code{nil}.}
1828 @result{} symbol 1829 @result{} symbol
1829(type-of '(x)) 1830(type-of '(x))
1830 @result{} cons 1831 @result{} cons
1832@end group
1831@end example 1833@end example
1832@end defun 1834@end defun
1833 1835
diff --git a/lispref/strings.texi b/lispref/strings.texi
index 796090bb80c..861e5b1c728 100644
--- a/lispref/strings.texi
+++ b/lispref/strings.texi
@@ -285,7 +285,7 @@ If @var{omit-nulls} is @code{nil}, the result contains null strings
285whenever there are two consecutive matches for @var{separators}, or a 285whenever there are two consecutive matches for @var{separators}, or a
286match is adjacent to the beginning or end of @var{string}. If 286match is adjacent to the beginning or end of @var{string}. If
287@var{omit-nulls} is @code{t}, these null strings are omitted from the 287@var{omit-nulls} is @code{t}, these null strings are omitted from the
288result list. 288result.
289 289
290If @var{separators} is @code{nil} (or omitted), 290If @var{separators} is @code{nil} (or omitted),
291the default is the value of @code{split-string-default-separators}. 291the default is the value of @code{split-string-default-separators}.
@@ -544,10 +544,11 @@ be a list of strings rather than an actual alist.
544@xref{Association Lists}. 544@xref{Association Lists}.
545@end defun 545@end defun
546 546
547 See also @code{compare-buffer-substrings} in @ref{Comparing Text}, for 547 See also the @code{compare-buffer-substrings} function in
548a way to compare text in buffers. The function @code{string-match}, 548@ref{Comparing Text}, for a way to compare text in buffers. The
549which matches a regular expression against a string, can be used 549function @code{string-match}, which matches a regular expression
550for a kind of string comparison; see @ref{Regexp Search}. 550against a string, can be used for a kind of string comparison; see
551@ref{Regexp Search}.
551 552
552@node String Conversion 553@node String Conversion
553@comment node-name, next, previous, up 554@comment node-name, next, previous, up
@@ -566,7 +567,7 @@ text representation of a string (@pxref{Converting Representations}).
566 @xref{Documentation}, for functions that produce textual descriptions 567 @xref{Documentation}, for functions that produce textual descriptions
567of text characters and general input events 568of text characters and general input events
568(@code{single-key-description} and @code{text-char-description}). These 569(@code{single-key-description} and @code{text-char-description}). These
569functions are used primarily for making help messages. 570are used primarily for making help messages.
570 571
571@defun char-to-string character 572@defun char-to-string character
572@cindex character to string 573@cindex character to string