Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.de

[gnu-emacs] / doc / misc / efaq.texi

diff --git a/doc/misc/efaq.texi b/doc/misc/efaq.texi
index 3e86f30cdb5bbdfe90c4586e6e2676f2efae052c..e596777817bfa48a4b4ef75fea9daa94f3c73190 100644 (file)
--- a/doc/misc/efaq.texi
+++ b/doc/misc/efaq.texi
@@ -1944,7 +1944,7 @@ automatically scrolls the display horizontally when point moves off the
 left or right edge of the window.
 
 Note that this is overridden by the variable
-@code{truncate-partial-width-windows} if that variable is non-nil
+@code{truncate-partial-width-windows} if that variable is non-@code{nil}
 and the current buffer is not full-frame width.
 
 In Emacs 20, use @code{hscroll-mode}.