aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-12-24 16:54:55 -0800
committerGlenn Morris2014-12-24 16:54:55 -0800
commit5306baa97b39ad28664a97bcf1fae0246dbcc2ff (patch)
treea87a06243f391e33417fb0d79c29488cf15f45f0
parent8f1b3e5bf1627c124dcb5a9ae4adb9cbd66b3e88 (diff)
downloademacs-5306baa97b39ad28664a97bcf1fae0246dbcc2ff.tar.gz
emacs-5306baa97b39ad28664a97bcf1fae0246dbcc2ff.zip
Markup fixes for doc/lispref
* doc/lispref/control.texi (Pattern matching case statement): * doc/lispref/positions.texi (List Motion): * doc/lispref/streams.texi (Output Functions): * doc/lispref/strings.texi (Text Comparison): * doc/lispref/text.texi (Document Object Model): Markup fixes.
-rw-r--r--doc/lispref/ChangeLog8
-rw-r--r--doc/lispref/control.texi6
-rw-r--r--doc/lispref/positions.texi4
-rw-r--r--doc/lispref/streams.texi2
-rw-r--r--doc/lispref/strings.texi10
-rw-r--r--doc/lispref/text.texi2
6 files changed, 20 insertions, 12 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3621c563d79..84654387dcd 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,11 @@
12014-12-25 Glenn Morris <rgm@gnu.org>
2
3 * control.texi (Pattern matching case statement):
4 * positions.texi (List Motion):
5 * streams.texi (Output Functions):
6 * strings.texi (Text Comparison):
7 * text.texi (Document Object Model): Markup fixes.
8
12014-12-22 Paul Eggert <eggert@cs.ucla.edu> 92014-12-22 Paul Eggert <eggert@cs.ucla.edu>
2 10
3 Remove obsolete references to pre-C99 builds 11 Remove obsolete references to pre-C99 builds
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 5cf6368db52..ea212337c96 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -370,9 +370,9 @@ More specifically, a Q-pattern can take the following forms:
370@item (@var{qpattern1} . @var{qpattern2}) 370@item (@var{qpattern1} . @var{qpattern2})
371This pattern matches any cons cell whose @code{car} matches @var{QPATTERN1} and 371This pattern matches any cons cell whose @code{car} matches @var{QPATTERN1} and
372whose @code{cdr} matches @var{PATTERN2}. 372whose @code{cdr} matches @var{PATTERN2}.
373@item [@var{qpattern1 qpattern2..qpatternm}] 373@item [@var{qpattern1} @var{qpattern2} @dots{} @var{qpatternm}]
374This pattern matches a vector of length @code{M} whose 0..(M-1)th 374This pattern matches a vector of length @var{M} whose 0..(@var{M}-1)th
375elements match @var{QPATTERN1}, @var{QPATTERN2}..@var{QPATTERNm}, 375elements match @var{qpattern1}, @var{qpattern2} @dots{} @var{qpatternm},
376respectively. 376respectively.
377@item @var{atom} 377@item @var{atom}
378This pattern matches any atom @code{equal} to @var{atom}. 378This pattern matches any atom @code{equal} to @var{atom}.
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index e32f0ef0b34..032baa9d2e3 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -654,9 +654,9 @@ quotes are ignored.)
654@deffn Command up-list &optional arg escape-strings no-syntax-crossing 654@deffn Command up-list &optional arg escape-strings no-syntax-crossing
655This function moves forward out of @var{arg} (default 1) levels of 655This function moves forward out of @var{arg} (default 1) levels of
656parentheses. A negative argument means move backward but still to a 656parentheses. A negative argument means move backward but still to a
657less deep spot. If @var{escape-strings} is non-nil (as it is 657less deep spot. If @var{escape-strings} is non-@code{nil} (as it is
658interactively), move out of enclosing strings as well. If 658interactively), move out of enclosing strings as well. If
659@var{no-syntax-crossing} is non-nil (as it is interactively), prefer 659@var{no-syntax-crossing} is non-@code{nil} (as it is interactively), prefer
660to break out of any enclosing string instead of moving to the start of 660to break out of any enclosing string instead of moving to the start of
661a list broken across multiple strings. On error, location of point is 661a list broken across multiple strings. On error, location of point is
662unspecified. 662unspecified.
diff --git a/doc/lispref/streams.texi b/doc/lispref/streams.texi
index c287b617713..b12adcf3dcf 100644
--- a/doc/lispref/streams.texi
+++ b/doc/lispref/streams.texi
@@ -618,7 +618,7 @@ spacing between calls.
618@defun terpri &optional stream ensure 618@defun terpri &optional stream ensure
619@cindex newline in print 619@cindex newline in print
620This function outputs a newline to @var{stream}. The name stands for 620This function outputs a newline to @var{stream}. The name stands for
621``terminate print''. If @var{ensure} is non-nil no newline is printed 621``terminate print''. If @var{ensure} is non-@code{nil} no newline is printed
622if @var{stream} is already at the beginning of a line. Note in this 622if @var{stream} is already at the beginning of a line. Note in this
623case @var{stream} can not be a function and an error is signalled if 623case @var{stream} can not be a function and an error is signalled if
624it is. This function returns @code{t} if a newline is printed. 624it is. This function returns @code{t} if a newline is printed.
diff --git a/doc/lispref/strings.texi b/doc/lispref/strings.texi
index 5e0148b75a9..1ecc5671a90 100644
--- a/doc/lispref/strings.texi
+++ b/doc/lispref/strings.texi
@@ -483,17 +483,17 @@ dependent; a @var{locale} "en_US.UTF-8" is applicable on POSIX
483systems, while it would be, e.g., "enu_USA.1252" on MS-Windows 483systems, while it would be, e.g., "enu_USA.1252" on MS-Windows
484systems. 484systems.
485 485
486If @var{IGNORE-CASE} is non-nil, characters are converted to lower-case 486If @var{ignore-case} is non-@code{nil}, characters are converted to lower-case
487before comparing them. 487before comparing them.
488 488
489To emulate Unicode-compliant collation on MS-Windows systems, 489To emulate Unicode-compliant collation on MS-Windows systems,
490bind @code{w32-collate-ignore-punctuation} to a non-nil value, since 490bind @code{w32-collate-ignore-punctuation} to a non-@code{nil} value, since
491the codeset part of the locale cannot be "UTF-8" on MS-Windows. 491the codeset part of the locale cannot be "UTF-8" on MS-Windows.
492 492
493If your system does not support a locale environment, this function 493If your system does not support a locale environment, this function
494behaves like @code{string-equal}. 494behaves like @code{string-equal}.
495 495
496Do NOT use this function to compare file names for equality, only 496Do @emph{not} use this function to compare file names for equality, only
497for sorting them. 497for sorting them.
498@end defun 498@end defun
499 499
@@ -602,11 +602,11 @@ behave like @code{string-lessp}:
602@end group 602@end group
603@end example 603@end example
604 604
605If @var{IGNORE-CASE} is non-nil, characters are converted to lower-case 605If @var{ignore-case} is non-@code{nil}, characters are converted to lower-case
606before comparing them. 606before comparing them.
607 607
608To emulate Unicode-compliant collation on MS-Windows systems, 608To emulate Unicode-compliant collation on MS-Windows systems,
609bind @code{w32-collate-ignore-punctuation} to a non-nil value, since 609bind @code{w32-collate-ignore-punctuation} to a non-@code{nil} value, since
610the codeset part of the locale cannot be "UTF-8" on MS-Windows. 610the codeset part of the locale cannot be "UTF-8" on MS-Windows.
611 611
612If your system does not support a locale environment, this function 612If your system does not support a locale environment, this function
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 3ef565b8f30..06d1381278c 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -4467,7 +4467,7 @@ Append @var{child} as the last child of @var{node}.
4467 4467
4468@item dom-add-child-before @var{node} @var{child} @var{before} 4468@item dom-add-child-before @var{node} @var{child} @var{before}
4469Add @var{child} to @var{node}'s child list before the @var{before} 4469Add @var{child} to @var{node}'s child list before the @var{before}
4470node. If @var{before} is nil, make @var{child} the first child. 4470node. If @var{before} is @code{nil}, make @var{child} the first child.
4471 4471
4472@item dom-set-attributes @var{node} @var{attributes} 4472@item dom-set-attributes @var{node} @var{attributes}
4473Replace all the attributes of the node with a new key/value list. 4473Replace all the attributes of the node with a new key/value list.