From 0434b79fd3e55f7bada163a3d5edb41f44d19a3f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Sat, 7 May 2016 22:04:47 -0400 Subject: [PATCH] cc: only set -std=c++11 in c++-mode --- modules/module-cc.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/module-cc.el b/modules/module-cc.el index f82b6c573..b6e857718 100644 --- a/modules/module-cc.el +++ b/modules/module-cc.el @@ -4,7 +4,7 @@ :commands (c-mode c++-mode objc-mode java-mode) :init (associate! objc-mode :match "\\.mm$") - (add-hook! 'c++-mode-hook '(highlight-numbers-mode narf|init-c++-C11-highlights)) + (add-hook! c++-mode '(highlight-numbers-mode narf|init-c++-C11-highlights)) (add-hook 'c-initialization-hook 'narf|init-c/c++-settings) ;; C++ header files @@ -44,7 +44,9 @@ :after cc-mode :config (setq irony-server-install-prefix (concat narf-temp-dir "/irony/")) - (push "-std=c++11" irony-additional-clang-options) + (add-hook! c++-mode + (make-variable-buffer-local 'irony-additional-clang-options) + (push "-std=c++11" irony-additional-clang-options)) (require 'irony-eldoc) (require 'company-irony)