aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorGlenn Morris2019-06-01 12:04:41 -0700
committerGlenn Morris2019-06-01 12:04:41 -0700
commit17a1dae4af751c82e78991350559481e9fa42959 (patch)
tree9d913268de49269e6116a8d368910dd6883ddb03 /doc/lispref
parent1860b6d57bb51cff082d4cf596bdd054f493c4cd (diff)
parent2168165ec05aa663d41998adb518e778899a8edd (diff)
downloademacs-17a1dae4af751c82e78991350559481e9fa42959.tar.gz
emacs-17a1dae4af751c82e78991350559481e9fa42959.zip
Merge from origin/emacs-26
2168165 ; * doc/lispref/nonascii.texi (Explicit Encoding): Fix typo. 8f18d12 Improve documentation of decoding into a unibyte buffer 7681a57 Remove redundants "See" before @xref or @pxref (Bug#35793) 9bee762 ; * src/coding.c: Improve commentary. (Bug#34765) e61349c Fix customization type of recentf-max-saved-items # Conflicts: # src/coding.c
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/control.texi2
-rw-r--r--doc/lispref/functions.texi2
-rw-r--r--doc/lispref/modes.texi2
-rw-r--r--doc/lispref/nonascii.texi9
-rw-r--r--doc/lispref/positions.texi4
5 files changed, 12 insertions, 7 deletions
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 5d4184e3fb4..e308d68b75d 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -1451,7 +1451,7 @@ Run @var{body} with @var{var} bound to each value that
1451@end defmac 1451@end defmac
1452 1452
1453The Common Lisp loop facility also contains features for working with 1453The Common Lisp loop facility also contains features for working with
1454iterators. See @xref{Loop Facility,,,cl,Common Lisp Extensions}. 1454iterators. @xref{Loop Facility,,,cl,Common Lisp Extensions}.
1455 1455
1456The following piece of code demonstrates some important principles of 1456The following piece of code demonstrates some important principles of
1457working with iterators. 1457working with iterators.
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index 2f9d898c9b0..ab07d389282 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -2378,7 +2378,7 @@ safe.
2378A form that creates temporary bindings (@code{condition-case}, 2378A form that creates temporary bindings (@code{condition-case},
2379@code{dolist}, @code{dotimes}, @code{lambda}, @code{let}, or 2379@code{dolist}, @code{dotimes}, @code{lambda}, @code{let}, or
2380@code{let*}), if all args are safe and the symbols to be bound are not 2380@code{let*}), if all args are safe and the symbols to be bound are not
2381explicitly risky (see @pxref{File Local Variables}). 2381explicitly risky (@pxref{File Local Variables}).
2382@item 2382@item
2383An assignment using @code{add-to-list}, @code{setq}, @code{push}, or 2383An assignment using @code{add-to-list}, @code{setq}, @code{push}, or
2384@code{pop}, if all args are safe and the symbols to be assigned are 2384@code{pop}, if all args are safe and the symbols to be assigned are
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index 27c5d77579f..f41607c5dc0 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -3023,7 +3023,7 @@ Its value should have one of the forms described in this table.
3023 3023
3024@strong{Warning:} Do not design an element of @code{font-lock-keywords} 3024@strong{Warning:} Do not design an element of @code{font-lock-keywords}
3025to match text which spans lines; this does not work reliably. 3025to match text which spans lines; this does not work reliably.
3026For details, see @xref{Multiline Font Lock}. 3026For details, @pxref{Multiline Font Lock}.
3027 3027
3028You can use @var{case-fold} in @code{font-lock-defaults} to specify 3028You can use @var{case-fold} in @code{font-lock-defaults} to specify
3029the value of @code{font-lock-keywords-case-fold-search} which says 3029the value of @code{font-lock-keywords-case-fold-search} which says
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 47206a406fd..8b0750abbf6 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1912,7 +1912,10 @@ the command returns the decoded text as a multibyte string without
1912inserting it. 1912inserting it.
1913 1913
1914If decoded text is inserted in some buffer, this command returns the 1914If decoded text is inserted in some buffer, this command returns the
1915length of the decoded text. 1915length of the decoded text. If that buffer is a unibyte buffer
1916(@pxref{Selecting a Representation}), the internal representation of
1917the decoded text (@pxref{Text Representations}) is inserted into the
1918buffer as individual bytes.
1916 1919
1917This command puts a @code{charset} text property on the decoded text. 1920This command puts a @code{charset} text property on the decoded text.
1918The value of the property states the character set used to decode the 1921The value of the property states the character set used to decode the
@@ -1931,7 +1934,9 @@ contains 8-bit bytes in their multibyte form).
1931 1934
1932If optional argument @var{buffer} specifies a buffer, the decoded text 1935If optional argument @var{buffer} specifies a buffer, the decoded text
1933is inserted in that buffer after point (point does not move). In this 1936is inserted in that buffer after point (point does not move). In this
1934case, the return value is the length of the decoded text. 1937case, the return value is the length of the decoded text. If that
1938buffer is a unibyte buffer, the internal representation of the decoded
1939text is inserted into it as individual bytes.
1935 1940
1936@cindex @code{charset}, text property 1941@cindex @code{charset}, text property
1937This function puts a @code{charset} text property on the decoded text. 1942This function puts a @code{charset} text property on the decoded text.
diff --git a/doc/lispref/positions.texi b/doc/lispref/positions.texi
index 527a3ab420c..77077934673 100644
--- a/doc/lispref/positions.texi
+++ b/doc/lispref/positions.texi
@@ -840,8 +840,8 @@ The argument @var{character-set} is a string, like the inside of a
840terminate it, and @samp{\} quotes @samp{^}, @samp{-} or @samp{\}. 840terminate it, and @samp{\} quotes @samp{^}, @samp{-} or @samp{\}.
841Thus, @code{"a-zA-Z"} skips over all letters, stopping before the 841Thus, @code{"a-zA-Z"} skips over all letters, stopping before the
842first nonletter, and @code{"^a-zA-Z"} skips nonletters stopping before 842first nonletter, and @code{"^a-zA-Z"} skips nonletters stopping before
843the first letter. See @xref{Regular Expressions}. Character classes 843the first letter (@pxref{Regular Expressions}). Character classes
844can also be used, e.g., @code{"[:alnum:]"}. See @pxref{Char Classes}. 844can also be used, e.g., @code{"[:alnum:]"} (@pxref{Char Classes}).
845 845
846If @var{limit} is supplied (it must be a number or a marker), it 846If @var{limit} is supplied (it must be a number or a marker), it
847specifies the maximum position in the buffer that point can be skipped 847specifies the maximum position in the buffer that point can be skipped