aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorGlenn Morris2020-06-17 08:47:53 -0700
committerGlenn Morris2020-06-17 08:47:53 -0700
commit21b03faed44913ba0b0e3d54d2ffdb0ac067fae8 (patch)
tree305caea08574a7d747e692e1ed1c023606502671 /doc/lispref
parent9682aa2f2493c89af1894ad2d52543d57f4958a5 (diff)
parent229995ba2cd9f6d0a749a38c106cbfbfd04119a8 (diff)
downloademacs-21b03faed44913ba0b0e3d54d2ffdb0ac067fae8.tar.gz
emacs-21b03faed44913ba0b0e3d54d2ffdb0ac067fae8.zip
Merge from origin/emacs-27
229995ba2c (origin/emacs-27) Fix some Texinfo markup 01e86b9fdf Fix recentf typo in Emacs manual cd4f75bb86 Rename default function to next-error-buffer-unnavigated-c... 1dff0a8949 * lisp/image-mode.el (image-toggle-display-image): Fix fit... a71d1787f1 * doc/misc/tramp.texi (Predefined connection information):... 079b0dc430 Delete, don't kill, dir dir fragments in icomplete-fido-ba... 6cdecc2659 Revert markup change in with-coding-priority docs 22f4fba8a9 * lisp/emulation/cua-rect.el (cua--rectangle-region-insert... 6b9eac6759 * lisp/simple.el (shell-command-on-region): Fix docstring. 43ad7dc1af Clean up D-Bus documentation (bug#41744) c43e5ed60d * lisp/image-mode.el (image-transform-original): New comma... 6eb18a950d Move tab-bar and tab-line faces to faces.el (part of bug#4... # Conflicts: # etc/NEWS # lisp/simple.el
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/control.texi2
-rw-r--r--doc/lispref/debugging.texi2
-rw-r--r--doc/lispref/errors.texi5
-rw-r--r--doc/lispref/files.texi2
-rw-r--r--doc/lispref/frames.texi2
-rw-r--r--doc/lispref/nonascii.texi6
-rw-r--r--doc/lispref/os.texi2
-rw-r--r--doc/lispref/text.texi2
8 files changed, 11 insertions, 12 deletions
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi
index 58f93366fe9..01ae94ea7dd 100644
--- a/doc/lispref/control.texi
+++ b/doc/lispref/control.texi
@@ -835,7 +835,7 @@ the second and subsequent occurrences do not expand to re-binding,
835but instead expand to an equality test using @code{eq}. 835but instead expand to an equality test using @code{eq}.
836 836
837The following example features a @code{pcase} form 837The following example features a @code{pcase} form
838with two clauses and two @var{seqpat}, A and B. 838with two clauses and two @var{seqpat}, A and B@.
839Both A and B first check that @var{expval} is a 839Both A and B first check that @var{expval} is a
840pair (using @code{pred}), 840pair (using @code{pred}),
841and then bind symbols to the @code{car} and @code{cdr} 841and then bind symbols to the @code{car} and @code{cdr}
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index 24ec656028f..29a0ab71ea4 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -402,7 +402,7 @@ assumptions are false if the debugger is running interpreted.
402@cindex backtrace buffer 402@cindex backtrace buffer
403 403
404Debugger mode is derived from Backtrace mode, which is also used to 404Debugger mode is derived from Backtrace mode, which is also used to
405show backtraces by Edebug and ERT. (@pxref{Edebug}, and @ref{Top,the 405show backtraces by Edebug and ERT@. (@pxref{Edebug}, and @ref{Top,the
406ERT manual,, ert, ERT: Emacs Lisp Regression Testing}.) 406ERT manual,, ert, ERT: Emacs Lisp Regression Testing}.)
407 407
408@cindex stack frame 408@cindex stack frame
diff --git a/doc/lispref/errors.texi b/doc/lispref/errors.texi
index dc6877c9eca..cd8694be8a3 100644
--- a/doc/lispref/errors.texi
+++ b/doc/lispref/errors.texi
@@ -79,9 +79,8 @@ The message is @samp{Symbol's chain of variable indirections contains
79a loop}. @xref{Variable Aliases}. 79a loop}. @xref{Variable Aliases}.
80 80
81@item dbus-error 81@item dbus-error
82The message is @samp{D-Bus error}. This is only defined if Emacs was 82The message is @samp{D-Bus error}. @xref{Errors and Events,,, dbus,
83compiled with D-Bus support. @xref{Errors and Events,,, dbus, D-Bus 83D-Bus integration in Emacs}.
84integration in Emacs}.
85 84
86@item end-of-buffer 85@item end-of-buffer
87The message is @samp{End of buffer}. @xref{Character Motion}. 86The message is @samp{End of buffer}. @xref{Character Motion}.
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 574c7e5aead..92cbc2a1c91 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1197,7 +1197,7 @@ inconclusive, the function returns @code{t} on Cygwin and @code{nil}
1197on macOS. 1197on macOS.
1198 1198
1199Currently this function always returns @code{nil} on platforms other 1199Currently this function always returns @code{nil} on platforms other
1200than MS-DOS, MS-Windows, Cygwin, and macOS. It does not detect 1200than MS-DOS, MS-Windows, Cygwin, and macOS@. It does not detect
1201case-insensitivity of mounted filesystems, such as Samba shares or 1201case-insensitivity of mounted filesystems, such as Samba shares or
1202NFS-mounted Windows volumes. On remote hosts, it assumes @code{t} for 1202NFS-mounted Windows volumes. On remote hosts, it assumes @code{t} for
1203the @samp{smb} method. For all other connection methods, runtime 1203the @samp{smb} method. For all other connection methods, runtime
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index 966f620558b..a82b585d93d 100644
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -2173,7 +2173,7 @@ it on an undecorated frame.
2173@item override-redirect 2173@item override-redirect
2174@cindex override redirect frames 2174@cindex override redirect frames
2175If non-@code{nil}, this means that this is an @dfn{override redirect} 2175If non-@code{nil}, this means that this is an @dfn{override redirect}
2176frame---a frame not handled by window managers under X. Override 2176frame---a frame not handled by window managers under X@. Override
2177redirect frames have no window manager decorations, can be positioned 2177redirect frames have no window manager decorations, can be positioned
2178and resized only via Emacs' positioning and resizing functions and are 2178and resized only via Emacs' positioning and resizing functions and are
2179usually drawn on top of all other frames. Setting this parameter has 2179usually drawn on top of all other frames. Setting this parameter has
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi
index 51831a05cc2..c6c78ec096e 100644
--- a/doc/lispref/nonascii.texi
+++ b/doc/lispref/nonascii.texi
@@ -1823,9 +1823,9 @@ than all the rest.
1823 1823
1824@defmac with-coding-priority coding-systems &rest body 1824@defmac with-coding-priority coding-systems &rest body
1825This macro executes @var{body}, like @code{progn} does 1825This macro executes @var{body}, like @code{progn} does
1826(@pxref{Sequencing}), with @var{coding-systems} at the front of the 1826(@pxref{Sequencing, progn}), with @var{coding-systems} at the front of
1827priority list for coding systems. @var{coding-systems} should be a 1827the priority list for coding systems. @var{coding-systems} should be
1828list of coding systems to prefer during execution of @var{body}. 1828a list of coding systems to prefer during execution of @var{body}.
1829@end defmac 1829@end defmac
1830 1830
1831@node Explicit Encoding 1831@node Explicit Encoding
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 67e44678299..91894522300 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -1989,7 +1989,7 @@ The result is @code{nil} if either argument is a NaN.
1989This returns the time difference @var{t1} @minus{} @var{t2} between 1989This returns the time difference @var{t1} @minus{} @var{t2} between
1990two time values, as a Lisp time value. The result is exact and its clock 1990two time values, as a Lisp time value. The result is exact and its clock
1991resolution is no worse than the worse of its two arguments' resolutions. 1991resolution is no worse than the worse of its two arguments' resolutions.
1992The result is floating-point only if it is infinite or a NaN. 1992The result is floating-point only if it is infinite or a NaN@.
1993If you need the difference in units 1993If you need the difference in units
1994of elapsed seconds, you can convert it with @code{time-convert} or 1994of elapsed seconds, you can convert it with @code{time-convert} or
1995@code{float-time}. @xref{Time Conversion}. 1995@code{float-time}. @xref{Time Conversion}.
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index d765c95f773..10e8246a5fa 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -5219,7 +5219,7 @@ Signaled when encountering invalid JSON syntax.
5219@end table 5219@end table
5220 5220
5221 Only top-level values (arrays and objects) can be serialized to 5221 Only top-level values (arrays and objects) can be serialized to
5222JSON. The subobjects within these top-level values can be of any 5222JSON@. The subobjects within these top-level values can be of any
5223type. Likewise, the parsing functions will only return vectors, 5223type. Likewise, the parsing functions will only return vectors,
5224hashtables, alists, and plists. 5224hashtables, alists, and plists.
5225 5225