diff options
| author | Glenn Morris | 2019-12-25 07:50:19 -0800 |
|---|---|---|
| committer | Glenn Morris | 2019-12-25 07:50:19 -0800 |
| commit | 2bb7bb4abfa5667ba5cd220ca3dd89731f33ff09 (patch) | |
| tree | 3317f66921cf3cd0d787816217bfd056e2bc2a3f /doc/lispref/objects.texi | |
| parent | 93d4725f9ceabfaf40e75ecf2e28b67789741941 (diff) | |
| parent | ca6a53d3bc91d6fef9aa872495ab74298ce91bee (diff) | |
| download | emacs-2bb7bb4abfa5667ba5cd220ca3dd89731f33ff09.tar.gz emacs-2bb7bb4abfa5667ba5cd220ca3dd89731f33ff09.zip | |
Merge from origin/emacs-27
ca6a53d3bc Don't default to showing X-Faces externally in Gnus
dbf4b5b2d0 Fix manual typo in Special Read Syntax
a9fe6dfa90 Fix problem with emacs -nw / eww / svg
0de63092c8 Clarify base64 requirements and say what {en,de}code_codin...
6184aa003f ; * etc/NEWS: Fix boring oddities.
51ea32dd12 * src/emacs-module.h.in: Add reference to manual.
75d0cef20d Trivial docstring fixes
ee12c421b6 imagemagick-types needs to initialize ImageMagick
# Conflicts:
# etc/NEWS
Diffstat (limited to 'doc/lispref/objects.texi')
| -rw-r--r-- | doc/lispref/objects.texi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi index e948814d1f7..e493210f92f 100644 --- a/doc/lispref/objects.texi +++ b/doc/lispref/objects.texi | |||
| @@ -160,7 +160,7 @@ Skip the next @samp{N} characters (@pxref{Comments}). | |||
| 160 | @samp{N} represented as a binary number (@samp{#b101010}). | 160 | @samp{N} represented as a binary number (@samp{#b101010}). |
| 161 | 161 | ||
| 162 | @item #(@dots{}) | 162 | @item #(@dots{}) |
| 163 | A string text properties (@pxref{Text Props and Strings}). | 163 | String text properties (@pxref{Text Props and Strings}). |
| 164 | 164 | ||
| 165 | @item #^ | 165 | @item #^ |
| 166 | A char table (@pxref{Char-Table Type}). | 166 | A char table (@pxref{Char-Table Type}). |