X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=utils%2Femacs%2Femacs.el;h=4a3a5031026a12dca9112faeee36c28d5b960fee;hb=8dd99ee81de8af8f0500e2baeacd29bf24b7f02c;hp=3f68ea84e18c4dd3e9f06307292c8f16c64de90c;hpb=55d2a1a54629b75a516b88165c8e48bdb2dea2c9;p=oota-llvm.git

diff --git a/utils/emacs/emacs.el b/utils/emacs/emacs.el
index 3f68ea84e18..4a3a5031026 100644
--- a/utils/emacs/emacs.el
+++ b/utils/emacs/emacs.el
@@ -1,12 +1,22 @@
 ;; LLVM coding style guidelines in emacs
-;; Maintainer: LLVM Team, http://llvm.cs.uiuc.edu
-;; Modified:   2005-04-24
+;; Maintainer: LLVM Team, http://llvm.org/
 
-;; Max 80 cols per line, indent by two spaces, no tabs.
-;; Apparently, this does not affect tabs in Makefiles.
-(custom-set-variables
-  '(fill-column 80)
-  '(c++-indent-level 2)
-  '(c-basic-offset 2)
-  '(indent-tabs-mode nil))
+;; Add a cc-mode style for editing LLVM C and C++ code
+(c-add-style "llvm.org"
+             '("gnu"
+	       (fill-column . 80)
+	       (c++-indent-level . 2)
+	       (c-basic-offset . 2)
+	       (indent-tabs-mode . nil)
+	       (c-offsets-alist . ((arglist-intro . ++)
+				   (innamespace . 0)
+				   (member-init-intro . ++)))))
 
+;; Files with "llvm" in their names will automatically be set to the
+;; llvm.org coding style.
+(add-hook 'c-mode-common-hook
+	  (function
+	   (lambda nil 
+	     (if (string-match "llvm" buffer-file-name)
+		 (progn
+		   (c-set-style "llvm.org"))))))