diff --git a/ChangeLog b/ChangeLog
index d7a0a72c08764b4057d29a9d070318da5c915953..fb0806228d3e6e862cda6ef18c036999169ead2a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -101,8 +101,9 @@ CVS code -
 	- Add the ability to change the characters used to display the
 	  beginning characters of tabs and spaces via the rcfile entry
 	  "whitespace".  This is disabled if nanorc support is disabled
-	  or if we're in tiny mode. (Mike Frysinger; minor changes and
-	  adaptations by DLR)
+	  or if we're in tiny mode.  Displaying the new characters is
+	  toggled on and off by Meta-P; the default is off. (Mike
+	  Frysinger; minor changes and adaptations by DLR)
 	- Add the ability to change the closing punctuation and closing
 	  brackets used to control justification, via the rcfile
 	  entries "punct" and "brackets". (DLR)
diff --git a/src/rcfile.c b/src/rcfile.c
index 8476eeac4c4fd914d43b58bb42a3832ce70c6fff..de5ec4a14429c9d17a445d84b1facb538f642e38 100644
--- a/src/rcfile.c
+++ b/src/rcfile.c
@@ -605,8 +605,7 @@ void parse_rcfile(FILE *rcstream)
 				    rcfile_error(_("Two non-control characters required"));
 				    free(whitespace);
 				    whitespace = NULL;
-				} else
-				    SET(WHITESPACE_DISPLAY);
+				}
 			    } else
 #endif
 #ifndef DISABLE_JUSTIFY