aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/emacs/display.texi46
-rw-r--r--doc/emacs/text.texi4
2 files changed, 28 insertions, 22 deletions
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 62a4b62cfca..38413a7543a 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1144,46 +1144,48 @@ right-to-left paragraphs.
1144@cindex mode, fill-column-indicator 1144@cindex mode, fill-column-indicator
1145@findex display-fill-column-indicator-mode 1145@findex display-fill-column-indicator-mode
1146@findex global-display-fill-column-indicator-mode 1146@findex global-display-fill-column-indicator-mode
1147 Emacs can add an indicator to display a fill column position. The 1147 Emacs can add an indicator to display a fill column position. The
1148fill column indicator is a useful functionality specially in 1148fill column indicator is a useful functionality specially in
1149prog-mode to indicate the position of an specific column. 1149prog-mode to indicate the position of an specific column.
1150 1150
1151 You can set the buffer-local variables @code{display-fill-column-indicator} 1151 You can set the buffer-local variables @code{display-fill-column-indicator}
1152and @code{display-fill-column-indicator-character} to activate the 1152and @code{display-fill-column-indicator-character} to activate the
1153indicator and controls how the indicator looks. 1153indicator and controls how the indicator looks.
1154 1154
1155Alternatively you can type @kbd{M-x display-fill-column-indicator-mode} or 1155Alternatively you can type @w{@kbd{M-x display-fill-column-indicator-mode}}
1156@kbd{M-x global-display-fill-column-indicator-mode} which enables the indicator 1156or @w{@kbd{M-x global-display-fill-column-indicator-mode}} which enables the
1157locally and globally respectively and also chooses the character to 1157indicator locally and globally respectively and also chooses the
1158use if none is set. It is possible to use the first one to activate the 1158character to use if none is set already. It is possible to use the
1159indicator in a hook or the second one to enable it globally. 1159first one to activate the indicator in a hook or the second one to
1160enable it globally.
1160 1161
1161There are 2 new buffer local variables and 1 face to customize this 1162There are 2 buffer local variables and 1 face to customize this mode:
1162mode:
1163 1163
1164@table @code 1164@table @code
1165@item display-fill-column-indicator-column 1165@item display-fill-column-indicator-column
1166@vindex display-fill-column-indicator-column 1166@vindex display-fill-column-indicator-column
1167Is the column number where the indicator should be set. It can take 1167Specifies the column number where the indicator should be set. It can
1168positive numerical values for the column or the special value t which 1168take positive numerical values for the column or the special value
1169means that the variable 'fill-column' will be used. 1169@code{t} which means that the variable @code{fill-column} will be
1170used.
1170 1171
1171Any other value disables the indicator. The default value is t. 1172Any other value disables the indicator. The default value is @code{t}.
1172 1173
1173@item display-fill-column-indicator-char 1174@item display-fill-column-indicator-char
1174@vindex display-fill-column-indicator-char 1175@vindex display-fill-column-indicator-char
1175Is the character used for the indicator. This character can be any 1176Specifies the character used for the indicator. This character can be
1176valid char including unicode ones if the actual font supports them. 1177any valid char including unicode ones if the actual font supports
1177 1178them.
1178When the mode is enabled throw the functions 1179
1180When the mode is enabled through the functions
1179@code{display-fill-column-indicator-mode} or 1181@code{display-fill-column-indicator-mode} or
1180@code{global-display-fill-column-indicator-mode}, the initialization 1182@code{global-display-fill-column-indicator-mode}, the initialization
1181functions check if this variable is non-nil, otherwise the 1183functions check if this variable is @code{non-nil}, otherwise the
1182initialization tries to set it to U+2502 or '|'. 1184initialization tries to set it to U+2502 or '|'.
1183 1185
1184@item fill-column-face 1186@item fill-column-face
1185Is the face used to display the indicator it inherits its default 1187Specifies the face used to display the indicator it inherits its
1186values from shadow and the default face. 1188default values from shadow and the default face.
1187@end table 1189@end table
1188 1190
1189@vindex indicate-buffer-boundaries 1191@vindex indicate-buffer-boundaries
diff --git a/doc/emacs/text.texi b/doc/emacs/text.texi
index 96492783b92..df2f6c00068 100644
--- a/doc/emacs/text.texi
+++ b/doc/emacs/text.texi
@@ -644,6 +644,10 @@ or before @samp{)}, @samp{:} or @samp{?}); and
644@code{fill-polish-nobreak-p} (don't break after a one letter word, 644@code{fill-polish-nobreak-p} (don't break after a one letter word,
645even if preceded by a non-whitespace character). 645even if preceded by a non-whitespace character).
646 646
647 Emacs can display an indicator in the @code{fill-column} position
648using the Display fill column indicator mode
649(@xref{Displaying Boundaries, display-fill-column-indicator}).
650
647@node Fill Prefix 651@node Fill Prefix
648@subsection The Fill Prefix 652@subsection The Fill Prefix
649 653