*** empty log message ***

2 files changed, 19 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 12d2428818d..0205740296e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -81,6 +81,11 @@ paragraphs.
 ** In Dired, the w command now copies the current line's file name
 into the kill ring.
 
+** The variables dired-free-space-program and dired-free-space-args
+have been renamed to directory-free-space-program and
+directory-free-space-args, and they now apply whenever Emacs puts a
+directory listing into a buffer.
+
 ** mouse-wheels can now scroll a specific fraction of the window
 (rather than a fixed number of lines) and the scrolling is `progressive'.
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4a490c35642..a2ab325af84 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,17 @@
+2001-12-18  Richard M. Stallman  <rms@gnu.org>
+
+        * files.el (directory-free-space-program): New variable.
+        (directory-free-space-args): New variable.
+        (insert-directory): Use those two variables for getting free space.
+        Use file-system-info instead, if that is defined.
+
+        * dired.el (dired-free-space-program): Variable deleted.
+        (dired-free-space-args): Variable deleted.
+        (dired-insert-directory): Don't try to determine free space.
+
+        * files.el (font-lock-defaults): Add risky-local-variables prop.
+        (hack-one-local-variable): Treat various font-lock variables as risky.
+
 2001-12-18  Werner Lemberg  <wl@gnu.org>
 
         * language/chinese.el, language/cyrillic.el,