replace clang-format with uncrustify.

diff --git a/.dir-locals.el b/.dir-locals.el
index 29999b9443f29f23e73a61d14b043bc4e339541b..687863811decc8f03dc46999def7e5de59232121 100644 (file)
--- 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 f4f2ae65c56f5099c9f79ac3f7e905f9c37c90c9..6842f759fab11b4f1809397668a8e341249320b8 100644 (file)
--- 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 bd089f4296e591bd6e7e083540a83f10bd8235fb..eeb32314587b1bb55fbc5c4333b826b13fcfc888 100755 (executable)
--- 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... "