aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJimmy Aguilar Mena2019-04-03 12:36:46 +0200
committerJimmy Aguilar Mena2019-05-05 16:27:37 +0200
commit18ea7605c06791641a465cd209a3de760d560863 (patch)
tree02c9c64cd8509d0071937f86719e348df0ecde83
parentd8089ad2c2b2fdb1b4cb972646ab85bb7d1ea504 (diff)
downloademacs-18ea7605c06791641a465cd209a3de760d560863.tar.gz
emacs-18ea7605c06791641a465cd209a3de760d560863.zip
;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.
-rw-r--r--doc/emacs/display.texi2
-rw-r--r--etc/NEWS2
-rw-r--r--src/xdisp.c7
3 files changed, 5 insertions, 6 deletions
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 38413a7543a..e1467a3e0be 100644
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1141,7 +1141,7 @@ right-to-left paragraphs.
1141@node Displaying Boundaries 1141@node Displaying Boundaries
1142@section Displaying Boundaries 1142@section Displaying Boundaries
1143 1143
1144@cindex mode, fill-column-indicator 1144@cindex mode, display-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
diff --git a/etc/NEWS b/etc/NEWS
index 444c059f05e..80d7f4f24c8 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -350,7 +350,7 @@ Customize the buffer-local variables 'display-fill-column-indicator'
350and 'display-fill-column-indicator-character' to activate the 350and 'display-fill-column-indicator-character' to activate the
351indicator. 351indicator.
352 352
353The indicators is not displayed at all in minibuffer windows and 353The indicator is not displayed at all in minibuffer windows and
354in tooltips, as it is not useful there. 354in tooltips, as it is not useful there.
355 355
356There are 2 new buffer local variables and 1 face to customize this 356There are 2 new buffer local variables and 1 face to customize this
diff --git a/src/xdisp.c b/src/xdisp.c
index 721e8ae125c..25ef98b49cf 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -33411,10 +33411,9 @@ either `relative' or `visual'. */);
33411 Fmake_variable_buffer_local (Qdisplay_fill_column_indicator); 33411 Fmake_variable_buffer_local (Qdisplay_fill_column_indicator);
33412 33412
33413 DEFVAR_LISP ("display-fill-column-indicator-column", Vdisplay_fill_column_indicator_column, 33413 DEFVAR_LISP ("display-fill-column-indicator-column", Vdisplay_fill_column_indicator_column,
33414 doc: /* Column to draw the fill column indicator when 33414 doc: /* Column for indicator when `display-fill-column-indicator' is non-nil.
33415`display-fill-column-indicator' is non-nil. The default value is t 33415The default value is t which means that the indicator will use the `fill-column' variable.
33416which means that the indicator will use the `fill-column' variable. If 33416If a numeric value is set, the indicator will be drawn in that column
33417a numeric value is set, the indicator will be drawn in that column
33418independently of the `fill-column' value. */); 33417independently of the `fill-column' value. */);
33419 Vdisplay_fill_column_indicator_column = Qt; 33418 Vdisplay_fill_column_indicator_column = Qt;
33420 DEFSYM (Qdisplay_fill_column_indicator_column, "display-fill-column-indicator-column"); 33419 DEFSYM (Qdisplay_fill_column_indicator_column, "display-fill-column-indicator-column");