3 files changed, 14 insertions, 1 deletions

diff --git a/.dir-locals.el b/.dir-locals.el
new file mode 100644
index 00000000000..377f0deb1a6
--- /dev/null
+++ b/.dir-locals.el
@@ -0,0 +1,7 @@
+((nil . ((indent-tabs-mode . t)
+         (tab-width . 8)
+         (fill-column . 80)))
+ (c-mode . ((c-file-style . "GNU")))
+ (change-log-mode . ((add-log-time-zone-rule . t)))
+ ("lisp/mail/pmail*"
+  . ((nil . ((change-log-default-name . "ChangeLog.pmail"))))))
diff --git a/ChangeLog b/ChangeLog
index e5a54c333d0..7a032d06adb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-23  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * make-dist (tempdir): Distribute .dir-locals.el.
+
+        * .dir-locals.el: New file.
+
 2008-12-19  Eli Zaretskii  <eliz@gnu.org>
 
         * config.bat (--with-system-malloc): New option; see msdos/INSTALL
diff --git a/make-dist b/make-dist
index eac1556bea0..06471f98a4a 100755
--- a/make-dist
+++ b/make-dist
@@ -305,7 +305,7 @@ mkdir ${tempdir}
 echo "Making links to top-level files"
 ln INSTALL README BUGS move-if-change ${tempdir}
 ln ChangeLog Makefile.in configure configure.in ${tempdir}
-ln config.bat make-dist update-subdirs vpath.sed ${tempdir}
+ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir}
 ### Copy these files; they're cross-filesystem symlinks.
 cp mkinstalldirs ${tempdir}
 cp config.sub ${tempdir}