summaryrefslogtreecommitdiff
path: root/doc/lispref/os.texi
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-10-12 10:28:40 -0700
committerGlenn Morris <rgm@gnu.org>2018-10-12 10:28:40 -0700
commit7a7a3a4bfe4086d3c89ff7baa6db1f746c28b5c2 (patch)
tree55bee2e8635883e7cf651936d960751db1350943 /doc/lispref/os.texi
parent9c231a447014823ed1955e16b6693adbe041ca99 (diff)
parent6e54762c3726be9e11b4beb21214abcd4192783a (diff)
downloademacs-7a7a3a4bfe4086d3c89ff7baa6db1f746c28b5c2.tar.gz
Merge from origin/emacs-26
6e54762 Fix Apple Script permissions error 19f705c Fix typo in 'timerp' documentation
Diffstat (limited to 'doc/lispref/os.texi')
-rw-r--r--doc/lispref/os.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi
index 64c327c3809..d74fec5cfd9 100644
--- a/doc/lispref/os.texi
+++ b/doc/lispref/os.texi
@@ -1841,7 +1841,7 @@ special object that stores the information about the next invocation
times and the function to invoke.
@defun timerp object
-This predicate function returns non-@code{nil} of @code{object} is a
+This predicate function returns non-@code{nil} if @code{object} is a
timer.
@end defun