aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.dir-locals.el3
-rw-r--r--.gitignore2
-rwxr-xr-xbootstrap4
3 files changed, 4 insertions, 5 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index 29999b944..687863811 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -1,8 +1,5 @@
1;; Per-directory local variables for GNU Emacs 23 and later. 1;; Per-directory local variables for GNU Emacs 23 and later.
2 2
3((c-mode
4 (eval add-hook 'before-save-hook #'clang-format-buffer nil t)))
5
6((nil 3((nil
7 . ((fill-column . 78) 4 . ((fill-column . 78)
8 (tab-width . 4) 5 (tab-width . 4)
diff --git a/.gitignore b/.gitignore
index f4f2ae65c..6842f759f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,8 @@ doc/tutorial/gversion.texi
62# top-level symlink can exist 62# top-level symlink can exist
63.clang-format 63.clang-format
64 64
65uncrustify.cfg
66
65# this exists outside of the main repository 67# this exists outside of the main repository
66cmake/ 68cmake/
67build 69build
diff --git a/bootstrap b/bootstrap
index bd089f429..eeb323145 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3,8 +3,8 @@
3echo "Removing folder 'libltdl'..." 3echo "Removing folder 'libltdl'..."
4rm -rf libltdl 4rm -rf libltdl
5 5
6# Install clang format symlink (if possible) 6# Install uncrustify format symlink (if possible)
7ln -s contrib/conf/editors/clang-format .clang-format 2> /dev/null 7ln -s contrib/uncrustify.cfg uncrustify.cfg 2> /dev/null
8 8
9echo "checking for libtoolize / libtool... " 9echo "checking for libtoolize / libtool... "
10 10