Revert 2007-03-25 change.

diff --git a/lisp/files.el b/lisp/files.el
index b96ab2e96fbeb80e2a0f92d1b44e0341eef50a89..9f3a73439a96e9b7b3aa7a20e8cf7e5e17f808a4 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2434,13 +2434,14 @@ asking you for confirmation."
 
 (mapc (lambda (pair)
        (put (car pair) 'safe-local-variable (cdr pair)))
-      '((buffer-read-only                . booleanp) ;; C source code
-       (fill-column                     . integerp) ;; C source code
-       (indent-tabs-mode                . booleanp) ;; C source code
-       (left-margin                     . integerp) ;; C source code
-       (no-update-autoloads             . booleanp)
-       (tab-width                       . integerp) ;; C source code
-       (truncate-lines                  . booleanp))) ;; C source code
+      '((buffer-read-only     . booleanp)   ;; C source code
+       (default-directory    . stringp)    ;; C source code
+       (fill-column          . integerp)   ;; C source code
+       (indent-tabs-mode     . booleanp)   ;; C source code
+       (left-margin          . integerp)   ;; C source code
+       (no-update-autoloads  . booleanp)
+       (tab-width            . integerp)   ;; C source code
+       (truncate-lines       . booleanp))) ;; C source code
 
 (put 'c-set-style 'safe-local-eval-function t)
 

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 7fd5f83ea78f3271150a976fc2f9cb4c10cae7fb..ce933cb13d592175140560e1b57ff597961731d5 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1042,7 +1042,7 @@ Returns the compilation buffer created."
                 highlight-regexp))
        ;; Output a mode setter, for saving and later reloading this buffer.
        (insert "-*- mode: " name-of-mode
-               "; compilation-directory: " (prin1-to-string compilation-directory)
+               "; default-directory: " (prin1-to-string default-directory)
                " -*-\n"
                (format "%s started at %s\n\n"
                        mode-name