Fix the build from the last commit

[oota-llvm.git] / utils / emacs / emacs.el

diff --git a/utils/emacs/emacs.el b/utils/emacs/emacs.el
index 43e17a7be6ae8aa53a16aba0a4d1ebb957caa520..969f538c81743413f32aabf4ce9e9463f925544e 100644 (file)
--- a/utils/emacs/emacs.el
+++ b/utils/emacs/emacs.el
@@ -1,6 +1,6 @@
 ;; LLVM coding style guidelines in emacs
 ;; Maintainer: LLVM Team, http://llvm.org/
-;; Modified:   2005-04-24
+;; Modified:   2009-07-28
 
 ;; Max 80 cols per line, indent by two spaces, no tabs.
 ;; Apparently, this does not affect tabs in Makefiles.
@@ -10,3 +10,30 @@
   '(c-basic-offset 2)
   '(indent-tabs-mode nil))
 
+
+;; Alternative to setting the global style.  Only files with "llvm" in
+;; their names will automatically set to the llvm.org coding style.
+(c-add-style "llvm.org"
+             '((fill-column . 80)
+              (c++-indent-level . 2)
+              (c-basic-offset . 2)
+              (indent-tabs-mode . nil)
+               (c-offsets-alist . ((innamespace 0)))))
+
+(add-hook 'c-mode-hook
+         (function
+          (lambda nil 
+            (if (string-match "llvm" buffer-file-name)
+                (progn
+                  (c-set-style "llvm.org")
+                  )
+              ))))
+
+(add-hook 'c++-mode-hook
+         (function
+          (lambda nil 
+            (if (string-match "llvm" buffer-file-name)
+                (progn
+                  (c-set-style "llvm.org")
+                  )
+              ))))