Revert "Enhance BranchProbabilityInfo::calcUnreachableHeuristics for InvokeInst"

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

diff --git a/utils/emacs/emacs.el b/utils/emacs/emacs.el
index a12848b4575482c4e01cc8ff6ffdceb8a4a8cef9..4a3a5031026a12dca9112faeee36c28d5b960fee 100644 (file)
--- a/utils/emacs/emacs.el
+++ b/utils/emacs/emacs.el
@@ -1,36 +1,22 @@
 ;; LLVM coding style guidelines in emacs
 ;; Maintainer: LLVM Team, http://llvm.org/
-;; Modified:   2005-04-24
 
-;; 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))
-
-
-;; Alternative to setting the global style.  Only files with "llvm" in
-;; their names will automatically set to the llvm.org coding style.
+;; Add a cc-mode style for editing LLVM C and C++ code
 (c-add-style "llvm.org"
-             '((fill-column . 80)
+             '("gnu"
+              (fill-column . 80)
               (c++-indent-level . 2)
               (c-basic-offset . 2)
-              (indent-tabs-mode . nil)))
-(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
+              (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")
-                  )
-              ))))
+                  (c-set-style "llvm.org"))))))