From 6523f6a12e4443f102e38b2f2d17b50999fc038f Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 3 Jan 2020 05:49:43 -0500 Subject: [PATCH] Move cpp-mode{,-map} aliases to autoloads They don't need to be in config.el --- modules/lang/cc/autoload.el | 5 +++++ modules/lang/cc/config.el | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/lang/cc/autoload.el b/modules/lang/cc/autoload.el index 251840b85..3cc5f3f82 100644 --- a/modules/lang/cc/autoload.el +++ b/modules/lang/cc/autoload.el @@ -3,6 +3,11 @@ ;;;###autoload (add-to-list 'auto-mode-alist '("\\.cl\\'" . opencl-mode)) +;; The plusses in c++-mode can be annoying to search for ivy/helm (which reads +;; queries as regexps), so we add these for convenience. +;;;###autoload (defalias 'cpp-mode 'c++-mode) +;;;###autoload (defvaralias 'cpp-mode-map 'c++-mode-map) + ;; ;; Library diff --git a/modules/lang/cc/config.el b/modules/lang/cc/config.el index 4708676c5..4d6e428e0 100644 --- a/modules/lang/cc/config.el +++ b/modules/lang/cc/config.el @@ -36,11 +36,6 @@ This is ignored by ccls.") :commands (c-mode c++-mode objc-mode java-mode) :mode ("\\.mm\\'" . objc-mode) :init - ;; The plusses in c++-mode can be annoying to search for ivy/helm (which reads - ;; queries as regexps), so we add these for convenience. - (defalias 'cpp-mode 'c++-mode) - (defvaralias 'cpp-mode-map 'c++-mode-map) - ;; Activate `c-mode', `c++-mode' or `objc-mode' depending on heuristics (add-to-list 'auto-mode-alist '("\\.h\\'" . +cc-c-c++-objc-mode))