summaryrefslogtreecommitdiff
path: root/doc/lispref/display.texi
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2019-09-15 16:38:23 -0700
committerGlenn Morris <rgm@gnu.org>2019-09-15 16:38:23 -0700
commita625ca5c2675a41c5c0d277def6b8cb4f4c4d6db (patch)
tree80a22e6d963bd93ba62c6df48e26aec7eecbbfa4 /doc/lispref/display.texi
parent211dc01a7bfac81281fa80e45e21157fc0c25b26 (diff)
parent30c4f35a6fc8a6507930923766c3126ac1c2063f (diff)
downloademacs-a625ca5c2675a41c5c0d277def6b8cb4f4c4d6db.tar.gz
Merge from origin/emacs-26
30c4f35 (origin/emacs-26) query-replace-regexp undo: Update next-repl... c596be0 Amend the menu caption for page "Display Property" in the Eli... 13b9510 Add description of chinese-sisheng
Diffstat (limited to 'doc/lispref/display.texi')
-rw-r--r--doc/lispref/display.texi2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index 428fe9595a6..3c3ee1fc6a4 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -25,7 +25,7 @@ that Emacs presents to the user.
* Fringes:: Controlling window fringes.
* Scroll Bars:: Controlling scroll bars.
* Window Dividers:: Separating windows visually.
-* Display Property:: Enabling special display features.
+* Display Property:: Images, margins, text size, etc.
* Images:: Displaying images in Emacs buffers.
* Xwidgets:: Displaying native widgets in Emacs buffers.
* Buttons:: Adding clickable buttons to Emacs buffers.