diff options
| -rw-r--r-- | utils/emacs/emacs.el | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/utils/emacs/emacs.el b/utils/emacs/emacs.el index 2ebc3c677ce..4a3a5031026 100644 --- a/utils/emacs/emacs.el +++ b/utils/emacs/emacs.el @@ -1,34 +1,22 @@ ;; LLVM coding style guidelines in emacs ;; Maintainer: LLVM Team, http://llvm.org/ -;; Add a cc-mode style for editing LLVM C++ code +;; 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 . ((arglist-intro . ++) (innamespace . 0) - (member-init-intro . ++) - )) - )) + (member-init-intro . ++))))) ;; Files with "llvm" in their names will automatically be set to the ;; llvm.org coding style. -(add-hook 'c-mode-hook +(add-hook 'c-mode-common-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") - ) - )))) + (c-set-style "llvm.org")))))) |