diff options
Diffstat (limited to 'utils/emacs/emacs.el')
-rw-r--r-- | utils/emacs/emacs.el | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/utils/emacs/emacs.el b/utils/emacs/emacs.el index 969f538..4a3a503 100644 --- a/utils/emacs/emacs.el +++ b/utils/emacs/emacs.el @@ -1,39 +1,22 @@ ;; LLVM coding style guidelines in emacs ;; Maintainer: LLVM Team, http://llvm.org/ -;; Modified: 2009-07-28 -;; 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) - (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") - ) - )))) + (c-offsets-alist . ((arglist-intro . ++) + (innamespace . 0) + (member-init-intro . ++))))) -(add-hook 'c++-mode-hook +;; 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")))))) |