aboutsummaryrefslogtreecommitdiffstats
path: root/doc/lispref
diff options
context:
space:
mode:
authorGlenn Morris2018-06-23 07:50:59 -0700
committerGlenn Morris2018-06-23 07:50:59 -0700
commitb81e193ac0c4644d041a4eb4fa4cb62cf9446bd6 (patch)
tree837db70e4aff8fce66886b0cfbe82dbccdea4b06 /doc/lispref
parent4df361557c3f1b4039fa59d23cd1ed66c2ca5b1c (diff)
parent5cb3991a4f78b39a2c95b22a5159ae3ba779397e (diff)
downloademacs-b81e193ac0c4644d041a4eb4fa4cb62cf9446bd6.tar.gz
emacs-b81e193ac0c4644d041a4eb4fa4cb62cf9446bd6.zip
Merge from origin/emacs-26
5cb3991 Fix a typo in emacs-lisp-intro.texi d6aa55e Avoid segfaults in replace-buffer-contents with large buffers d22b8d1 Adjust for scaling for mode-line popup menus (Bug#31880) 3d2e3dc Change name of `seqp' argument (Bug#26411) 40e1db8 Change index of ";" to better reflect it's usage (Bug#31623) d289e7e Fix bug of 'mouse-drag-and-drop-region' to detect edges of re... e292c09 Fix #'fun handling inside `labels' (Bug#31792)
Diffstat (limited to 'doc/lispref')
-rw-r--r--doc/lispref/objects.texi18
-rw-r--r--doc/lispref/sequences.texi4
2 files changed, 11 insertions, 11 deletions
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 1253e46297f..b94de80b658 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -109,15 +109,15 @@ not be evaluated later. @xref{Input Functions}, for a description of
109@node Comments 109@node Comments
110@section Comments 110@section Comments
111@cindex comments 111@cindex comments
112@cindex @samp{;} in comment 112@cindex @samp{;} for commenting
113 113
114 A @dfn{comment} is text that is written in a program only for the sake 114 A @dfn{comment} is text that is written in a program only for the
115of humans that read the program, and that has no effect on the meaning 115sake of humans that read the program, and that has no effect on the
116of the program. In Lisp, a semicolon (@samp{;}) starts a comment if it 116meaning of the program. In Lisp, an unescaped semicolon (@samp{;})
117is not within a string or character constant. The comment continues to 117starts a comment if it is not within a string or character constant.
118the end of line. The Lisp reader discards comments; they do not become 118The comment continues to the end of line. The Lisp reader discards
119part of the Lisp objects which represent the program within the Lisp 119comments; they do not become part of the Lisp objects which represent
120system. 120the program within the Lisp system.
121 121
122 The @samp{#@@@var{count}} construct, which skips the next @var{count} 122 The @samp{#@@@var{count}} construct, which skips the next @var{count}
123characters, is useful for program-generated comments containing binary 123characters, is useful for program-generated comments containing binary
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi
index ffec6f37df7..566ba8de18f 100644
--- a/doc/lispref/sequences.texi
+++ b/doc/lispref/sequences.texi
@@ -474,8 +474,8 @@ built-in sequence types, @code{seq-length} behaves like @code{length}.
474@xref{Definition of length}. 474@xref{Definition of length}.
475@end defun 475@end defun
476 476
477@defun seqp sequence 477@defun seqp object
478 This function returns non-@code{nil} if @var{sequence} is a sequence 478 This function returns non-@code{nil} if @var{object} is a sequence
479(a list or array), or any additional type of sequence defined via 479(a list or array), or any additional type of sequence defined via
480@file{seq.el} generic functions. 480@file{seq.el} generic functions.
481 481