aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nicolaescu2008-12-24 00:45:51 +0000
committerDan Nicolaescu2008-12-24 00:45:51 +0000
commitb08ddfb407a2017fd781fadf6cc2573909a2b664 (patch)
treefd02eb2d3bae296282454ba1fa8344825a61fc64
parentbb31cb3171af96b927917937e94308dd7350af46 (diff)
downloademacs-b08ddfb407a2017fd781fadf6cc2573909a2b664.tar.gz
emacs-b08ddfb407a2017fd781fadf6cc2573909a2b664.zip
* make-dist (tempdir): Distribute .dir-locals.el.
* .dir-locals.el: New file.
-rw-r--r--.dir-locals.el7
-rw-r--r--ChangeLog6
-rwxr-xr-xmake-dist2
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 @@
1((nil . ((indent-tabs-mode . t)
2 (tab-width . 8)
3 (fill-column . 80)))
4 (c-mode . ((c-file-style . "GNU")))
5 (change-log-mode . ((add-log-time-zone-rule . t)))
6 ("lisp/mail/pmail*"
7 . ((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 @@
12008-12-23 Dan Nicolaescu <dann@ics.uci.edu>
2
3 * make-dist (tempdir): Distribute .dir-locals.el.
4
5 * .dir-locals.el: New file.
6
12008-12-19 Eli Zaretskii <eliz@gnu.org> 72008-12-19 Eli Zaretskii <eliz@gnu.org>
2 8
3 * config.bat (--with-system-malloc): New option; see msdos/INSTALL 9 * 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}
305echo "Making links to top-level files" 305echo "Making links to top-level files"
306ln INSTALL README BUGS move-if-change ${tempdir} 306ln INSTALL README BUGS move-if-change ${tempdir}
307ln ChangeLog Makefile.in configure configure.in ${tempdir} 307ln ChangeLog Makefile.in configure configure.in ${tempdir}
308ln config.bat make-dist update-subdirs vpath.sed ${tempdir} 308ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir}
309### Copy these files; they're cross-filesystem symlinks. 309### Copy these files; they're cross-filesystem symlinks.
310cp mkinstalldirs ${tempdir} 310cp mkinstalldirs ${tempdir}
311cp config.sub ${tempdir} 311cp config.sub ${tempdir}