;Small changes in the documentation

*src/xdisp.c: Fixed docstring for display-fill-column-indicator-column
*etc/NEWS: Concordance fix in the display-fill-column-indicator part.
*doc/emacs/display.texi: Name mismatch fix.

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 38413a7543ab09a4f97ecf1a048b8a28fc8e41dd..e1467a3e0be4bfc0d1922ec07900993b6054291d 100644 (file)
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1141,7 +1141,7 @@ right-to-left paragraphs.
 @node Displaying Boundaries
 @section Displaying Boundaries
 
-@cindex mode, fill-column-indicator
+@cindex mode, display-fill-column-indicator
 @findex display-fill-column-indicator-mode
 @findex global-display-fill-column-indicator-mode
   Emacs can add an indicator to display a fill column position.  The

diff --git a/etc/NEWS b/etc/NEWS
index 444c059f05eb093dd2159ae05bda6ba05c6b1cec..80d7f4f24c89ba437a58e6b0b6220417cfa033cc 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -350,7 +350,7 @@ Customize the buffer-local variables 'display-fill-column-indicator'
 and 'display-fill-column-indicator-character' to activate the
 indicator.
 
-The indicators is not displayed at all in minibuffer windows and
+The indicator is not displayed at all in minibuffer windows and
 in tooltips, as it is not useful there.
 
 There are 2 new buffer local variables and 1 face to customize this

diff --git a/src/xdisp.c b/src/xdisp.c
index 721e8ae125cf697bcd8fd9e74a9069d265f51bde..25ef98b49cf90577974de48c2570c4aff8e06762 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -33411,10 +33411,9 @@ either `relative' or `visual'.  */);
   Fmake_variable_buffer_local (Qdisplay_fill_column_indicator);
 
   DEFVAR_LISP ("display-fill-column-indicator-column", Vdisplay_fill_column_indicator_column,
-    doc: /* Column to draw the fill column indicator when
-`display-fill-column-indicator' is non-nil.  The default value is t
-which means that the indicator will use the `fill-column' variable. If
-a numeric value is set, the indicator will be drawn in that column
+    doc: /* Column for indicator when `display-fill-column-indicator' is non-nil.
+The default value is t which means that the indicator will use the `fill-column' variable.
+If a numeric value is set, the indicator will be drawn in that column
 independently of the `fill-column' value.  */);
   Vdisplay_fill_column_indicator_column = Qt;
   DEFSYM (Qdisplay_fill_column_indicator_column, "display-fill-column-indicator-column");