From 012375839fe9e5ee72a9ab5d4dfff7c1d7cff60a Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Sun, 31 May 2015 23:09:27 -0400 Subject: [PATCH] c-c++ layer: rename default mode for header variable New name is `c-c++-default-mode-for-headers`, possible values are `c-mode` or `c++-mode`. --- contrib/!lang/c-c++/README.md | 5 +++-- contrib/!lang/c-c++/config.el | 4 ++-- contrib/!lang/c-c++/packages.el | 3 +-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/!lang/c-c++/README.md b/contrib/!lang/c-c++/README.md index 7f6a94b9d..180b465a8 100644 --- a/contrib/!lang/c-c++/README.md +++ b/contrib/!lang/c-c++/README.md @@ -49,11 +49,12 @@ To use this contribution add it to your `~/.spacemacs` ### Default mode for header files By default header files are open in `c-mode`, you can open them in `c++-mode` -by setting the variable `c-c++-use-c++-mode-for-dot-h` to `t`. +by setting the variable `c-c++-default-mode-for-headers` to `c++-mode`. ```elisp (setq-default dotspacemacs-configuration-layers - '((c-c++ variables: c-c++-use-c++-mode-for-dot-h t))) + '((c-c++ variables: + c-c++-default-mode-for-headers 'c++-mode))) ``` **Note** To set the variable for a given project, create a directory local diff --git a/contrib/!lang/c-c++/config.el b/contrib/!lang/c-c++/config.el index 0566eaa73..d9a9c5618 100644 --- a/contrib/!lang/c-c++/config.el +++ b/contrib/!lang/c-c++/config.el @@ -18,5 +18,5 @@ (spacemacs|defvar-company-backends c-mode-common) (spacemacs|defvar-company-backends cmake-mode) -(defvar c-c++-use-c++-mode-for-dot-h nil - "If non nil then use c++-mode when opening .h files.") +(defvar c-c++-default-mode-for-headers 'c-mode + "Default mode to open header files. Can be `c-mode' or `c++-mode'.") diff --git a/contrib/!lang/c-c++/packages.el b/contrib/!lang/c-c++/packages.el index 406c1c18c..a31af63d4 100644 --- a/contrib/!lang/c-c++/packages.el +++ b/contrib/!lang/c-c++/packages.el @@ -33,8 +33,7 @@ (use-package cc-mode :defer t :init - (when c-c++-use-c++-mode-for-dot-h - (add-to-list 'auto-mode-alist '("\\.h$" . c++-mode))) + (add-to-list 'auto-mode-alist `("\\.h$" . ,c-c++-default-mode-for-headers)) :config (progn (require 'compile)