summaryrefslogtreecommitdiff
path: root/doc/lispref
diff options
context:
space:
mode:
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/functions.texi1
-rw-r--r--doc/lispref/nonascii.texi15
-rw-r--r--doc/lispref/objects.texi1
3 files changed, 11 insertions, 6 deletions
diff --git a/doc/lispref/functions.texi b/doc/lispref/functions.texi
index c659ecaf3f8..772ffd8a136 100644
--- a/doc/lispref/functions.texi
+++ b/doc/lispref/functions.texi
@@ -2726,6 +2726,7 @@ function. This allows function-level control of the safety level used
for the code emitted for the function (@pxref{Native-Compilation
Variables}).
+@cindex function type declaration
@item (ftype @var{type} &optional @var{function})
Declare @var{type} to be the type of this function. This is used for
documentation by @code{describe-function}. Also it can be used by the
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 448d778f4cb..345460e2cda 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -341,6 +341,9 @@ buffer. An indirect buffer always inherits the representation of its
base buffer.
@end defun
+The following two functions are obsolete and will be removed in a future
+version of Emacs; use @code{encode-coding-string} instead.
+
@defun string-as-unibyte string
If @var{string} is already a unibyte string, this function returns
@var{string} itself. Otherwise, it returns a new string with the same
@@ -1096,13 +1099,13 @@ that result from encoding unsupported characters.
@cindex EOL conversion
@cindex end-of-line conversion
@cindex line end conversion
- @dfn{End of line conversion} handles three different conventions
-used on various systems for representing end of line in files. The
-Unix convention, used on GNU and Unix systems, is to use the linefeed
-character (also called newline). The DOS convention, used on
+ @dfn{End of line conversion} handles three different conventions used
+on various systems for representing end of line in files. The Unix
+convention, used on GNU and Unix systems, and macOS, is to use the
+linefeed character (also called newline). The DOS convention, used on
MS-Windows and MS-DOS systems, is to use a carriage return and a
-linefeed at the end of a line. The Mac convention is to use just
-carriage return. (This was the convention used in Classic Mac OS.)
+linefeed. The Mac convention, used in Classic Mac OS and now rare
+outside of legacy software, is to use just carriage return.
@cindex base coding system
@cindex variant coding system
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 3bd5a4528b0..630765213a2 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1545,6 +1545,7 @@ The @code{not} type specifier defines any type except the specified one.
The @code{member} type specifier allows to specify a type that includes
only the explicitly listed values.
+@cindex declared type of a function
@item (function (@var{arg-1-type} @dots{} @var{arg-n-type}) @var{return-type})
The @code{function} type specifier is used to describe the argument
types and the return type of a function. Argument types can be interleaved