summaryrefslogtreecommitdiff
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 @@
;; Per-directory local variables for GNU Emacs 23 and later.
-((c-mode
- (eval add-hook 'before-save-hook #'clang-format-buffer nil t)))
-
((nil
. ((fill-column . 78)
(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
# top-level symlink can exist
.clang-format
+uncrustify.cfg
+
# this exists outside of the main repository
cmake/
build
diff --git a/bootstrap b/bootstrap
index bd089f429..eeb323145 100755
--- a/bootstrap
+++ b/bootstrap
@@ -3,8 +3,8 @@
echo "Removing folder 'libltdl'..."
rm -rf libltdl
-# Install clang format symlink (if possible)
-ln -s contrib/conf/editors/clang-format .clang-format 2> /dev/null
+# Install uncrustify format symlink (if possible)
+ln -s contrib/uncrustify.cfg uncrustify.cfg 2> /dev/null
echo "checking for libtoolize / libtool... "