Merge from origin/emacs-24

[gnu-emacs] / doc / emacs / display.texi

diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi
index 083bb2e2170250218921037c76c0d673df94cf86..53bea5218efd47b395e4c0e0630636ba0d462c26 100644 (file)
--- a/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@ -1201,7 +1201,7 @@ Highlight space and non-breaking space characters.
 
 @item lines
 @vindex whitespace-line-column
-Highlight lines longer than 80 lines.  To change the column limit,
+Highlight lines longer than 80 columns.  To change the column limit,
 customize the variable @code{whitespace-line-column}.
 
 @item newline