diff options
| author | Glenn Morris | 2019-02-20 12:07:22 -0800 |
|---|---|---|
| committer | Glenn Morris | 2019-02-20 12:07:22 -0800 |
| commit | 83a9133e35827c1edbd8bf24a17ffa3b4bfb7be3 (patch) | |
| tree | 11d2812db4a9ee4e66976b3a5f1e5ecbe52b4955 /doc/lispref | |
| parent | ae77728d14e58054bdaee3c6965979947c778208 (diff) | |
| parent | ff9c9620794e5fe5692cfd3badd207aac78921cb (diff) | |
| download | emacs-83a9133e35827c1edbd8bf24a17ffa3b4bfb7be3.tar.gz emacs-83a9133e35827c1edbd8bf24a17ffa3b4bfb7be3.zip | |
Merge from origin/emacs-26
ff9c962 ; * lisp/ldefs-boot.el: Update.
b4a251c * ; ChangeLog.3 update
d3104e3 * etc/AUTHORS: Update.
a19bfb7 Remove .art from the default list of ImageMagick extensions
6985caa Fix input after setting x-wait-for-event-timeout nil
715388a Fix two warnings in eshell.texi
d49cdd9 * lisp/minibuffer.el (completion-table-dynamic): Improve docs...
5dc4e51 * lisp/emacs-lisp/debug.el (debug-on-variable-change): Doc fi...
76ef805 Fix a typo in ELisp manual
b5e66f4 Update citations of Internet RFCs
57ece2a Fix handling of manpage references divided by hyphenation
7ad0cd6 * doc/misc/eshell.texi: Fix some @ref's.
12b7940 Fix a typo in lispref/syntax.texi
# Conflicts:
# lisp/gnus/nnrss.el
# lisp/mail/ietf-drums.el
Diffstat (limited to 'doc/lispref')
| -rw-r--r-- | doc/lispref/abbrevs.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/os.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/syntax.texi | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/doc/lispref/abbrevs.texi b/doc/lispref/abbrevs.texi index b92d3701ec9..b67c014a83d 100644 --- a/doc/lispref/abbrevs.texi +++ b/doc/lispref/abbrevs.texi | |||
| @@ -473,7 +473,7 @@ Set the property @var{prop} of abbrev table @var{table} to value @var{val}. | |||
| 473 | 473 | ||
| 474 | @defun abbrev-table-get table prop | 474 | @defun abbrev-table-get table prop |
| 475 | Return the property @var{prop} of abbrev table @var{table}, or @code{nil} | 475 | Return the property @var{prop} of abbrev table @var{table}, or @code{nil} |
| 476 | if the abbrev has no such property. | 476 | if @var{table} has no such property. |
| 477 | @end defun | 477 | @end defun |
| 478 | 478 | ||
| 479 | The following properties have special meaning: | 479 | The following properties have special meaning: |
diff --git a/doc/lispref/os.texi b/doc/lispref/os.texi index 9766b8321fa..cb8f25df0a3 100644 --- a/doc/lispref/os.texi +++ b/doc/lispref/os.texi | |||
| @@ -1562,7 +1562,7 @@ following form: | |||
| 1562 | The format of this list is the same as what @code{decode-time} accepts | 1562 | The format of this list is the same as what @code{decode-time} accepts |
| 1563 | (@pxref{Time Conversion}), and is described in more detail there. Any | 1563 | (@pxref{Time Conversion}), and is described in more detail there. Any |
| 1564 | element that cannot be determined from the input will be set to | 1564 | element that cannot be determined from the input will be set to |
| 1565 | @code{nil}. The argument @var{string} should resemble an RFC 2822 or | 1565 | @code{nil}. The argument @var{string} should resemble an RFC 822 (or later) or |
| 1566 | ISO 8601 string, like ``Fri, 25 Mar 2016 16:24:56 +0100'' or | 1566 | ISO 8601 string, like ``Fri, 25 Mar 2016 16:24:56 +0100'' or |
| 1567 | ``1998-09-12T12:21:54-0200'', but this function will attempt to parse | 1567 | ``1998-09-12T12:21:54-0200'', but this function will attempt to parse |
| 1568 | less well-formed time strings as well. | 1568 | less well-formed time strings as well. |
diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index 25b9b35250f..b0c04ef9c25 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi | |||
| @@ -1041,8 +1041,8 @@ This function returns the syntax code for the raw syntax descriptor | |||
| 1041 | @var{syntax-code} component, masks off the high 16 bits which record | 1041 | @var{syntax-code} component, masks off the high 16 bits which record |
| 1042 | the syntax flags, and returns the resulting integer. | 1042 | the syntax flags, and returns the resulting integer. |
| 1043 | 1043 | ||
| 1044 | If @var{syntax} is @code{nil}, the return value is returns @code{nil}. | 1044 | If @var{syntax} is @code{nil}, the return value is @code{nil}. This |
| 1045 | This is so that the expression | 1045 | is so that the expression |
| 1046 | 1046 | ||
| 1047 | @example | 1047 | @example |
| 1048 | (syntax-class (syntax-after pos)) | 1048 | (syntax-class (syntax-after pos)) |