From c429da847f8f8b9c8abdc8dcf1096514d851be6a Mon Sep 17 00:00:00 2001 From: Ramkumar Ramachandra Date: Thu, 22 Jan 2015 20:56:25 +0000 Subject: [emacs] Use c-mode-common-hook, derive from "gnu" Make it clear that the "llvm.org" style is deriving from "gnu" style, and use the c-mode-common-hook instead of c-mode-hook and c++-mode-hook. Differential Revision: http://reviews.llvm.org/D7035 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@226861 91177308-0d34-0410-b5e6-96231b3b80d8 --- utils/emacs/emacs.el | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'utils/emacs') 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")))))) -- cgit v1.2.3