aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2019-08-10 08:44:31 -0700
committerGlenn Morris2019-08-10 08:44:31 -0700
commit7343474b79332b05abc1d51ae2bbc3e2ba43deeb (patch)
treec584ffae74bddab1b6f8d89035dc0e5af06178aa /doc
parent6bebfa77a9ae8c63b29f159387600c097ea32eaa (diff)
parent0860ac0e9db15ee0f094df7f6b0bbd5961bb08ac (diff)
downloademacs-7343474b79332b05abc1d51ae2bbc3e2ba43deeb.tar.gz
emacs-7343474b79332b05abc1d51ae2bbc3e2ba43deeb.zip
Merge from origin/emacs-26
0860ac0 (origin/emacs-26) Improve documentation of features that use ... fae1ff6 Fix docstrings in pong 82a2894 Improve doc strings of 'append-to-buffer' and friends cb0403d Fix octave-mode ElDoc support 691790b Avoid Groff hanging on MS-Windows when invoked by "M-x man"
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/display.texi4
1 files changed, 3 insertions, 1 deletions
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 8e842bea179..6fc99bd2716 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1116,7 +1116,8 @@ the arrows scrolls the display horizontally in the direction of the
1116arrow. 1116arrow.
1117 1117
1118 The fringes can also indicate other things, such as buffer 1118 The fringes can also indicate other things, such as buffer
1119boundaries (@pxref{Displaying Boundaries}), and where a program you 1119boundaries (@pxref{Displaying Boundaries}), unused lines near the end
1120of the window (@pxref{indicate-empty-lines}), and where a program you
1120are debugging is executing (@pxref{Debuggers}). 1121are debugging is executing (@pxref{Debuggers}).
1121 1122
1122@vindex overflow-newline-into-fringe 1123@vindex overflow-newline-into-fringe
@@ -1258,6 +1259,7 @@ extra spaces at the end of each line in the region.
1258@vindex indicate-empty-lines 1259@vindex indicate-empty-lines
1259@cindex unused lines 1260@cindex unused lines
1260@cindex fringes, and unused line indication 1261@cindex fringes, and unused line indication
1262@anchor{indicate-empty-lines}
1261 On graphical displays, Emacs can indicate unused lines at the end of 1263 On graphical displays, Emacs can indicate unused lines at the end of
1262the window with a small image in the left fringe (@pxref{Fringes}). 1264the window with a small image in the left fringe (@pxref{Fringes}).
1263The image appears for screen lines that do not correspond to any 1265The image appears for screen lines that do not correspond to any