diff options
| author | Glenn Morris | 2019-09-15 16:38:23 -0700 |
|---|---|---|
| committer | Glenn Morris | 2019-09-15 16:38:23 -0700 |
| commit | a625ca5c2675a41c5c0d277def6b8cb4f4c4d6db (patch) | |
| tree | 80a22e6d963bd93ba62c6df48e26aec7eecbbfa4 /doc/lispref | |
| parent | 211dc01a7bfac81281fa80e45e21157fc0c25b26 (diff) | |
| parent | 30c4f35a6fc8a6507930923766c3126ac1c2063f (diff) | |
| download | emacs-a625ca5c2675a41c5c0d277def6b8cb4f4c4d6db.tar.gz emacs-a625ca5c2675a41c5c0d277def6b8cb4f4c4d6db.zip | |
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')
| -rw-r--r-- | doc/lispref/display.texi | 2 |
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. | |||
| 25 | * Fringes:: Controlling window fringes. | 25 | * Fringes:: Controlling window fringes. |
| 26 | * Scroll Bars:: Controlling scroll bars. | 26 | * Scroll Bars:: Controlling scroll bars. |
| 27 | * Window Dividers:: Separating windows visually. | 27 | * Window Dividers:: Separating windows visually. |
| 28 | * Display Property:: Enabling special display features. | 28 | * Display Property:: Images, margins, text size, etc. |
| 29 | * Images:: Displaying images in Emacs buffers. | 29 | * Images:: Displaying images in Emacs buffers. |
| 30 | * Xwidgets:: Displaying native widgets in Emacs buffers. | 30 | * Xwidgets:: Displaying native widgets in Emacs buffers. |
| 31 | * Buttons:: Adding clickable buttons to Emacs buffers. | 31 | * Buttons:: Adding clickable buttons to Emacs buffers. |