From 2d3937ac1f8d7c096e734f8ba9cd048a1b9bb4e7 Mon Sep 17 00:00:00 2001 From: Andrew Whatson Date: Tue, 26 Feb 2019 10:26:19 +1000 Subject: [PATCH] Restore C/C++ default-header-file-mode support --- modules/lang/cc/autoload.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/lang/cc/autoload.el b/modules/lang/cc/autoload.el index c354e84de..0aba0b2dc 100644 --- a/modules/lang/cc/autoload.el +++ b/modules/lang/cc/autoload.el @@ -70,9 +70,9 @@ preceded by the opening brace or a comma (disregarding whitespace in between)." "\\|[-+] ([a-zA-Z0-9_]+)" "\\)"))) (objc-mode)) - ((fboundp 'c-or-c++-mode) ; introduced in Emacs 26.1 - (c-or-c++-mode)) - ((+cc--re-search-for ; TODO Remove this along with Emacs 25 support + ;; NOTE c-or-c++-mode was introduced in Emacs 26.1, but it doesn't + ;; support specification of a default/fallback mode + ((+cc--re-search-for (let ((id "[a-zA-Z0-9_]+") (ws "[ \t\r]+") (ws-maybe "[ \t\r]*")) (concat "^" ws-maybe "\\(?:" "using" ws "\\(?:namespace" ws "std;\\|std::\\)"