update font-lock keywords to include some C++11/14 stuff

[emacs-init.git] / setup / emacsstuff.el

diff --git a/setup/emacsstuff.el b/setup/emacsstuff.el
index 26dfeb5..9f8764a 100644 (file)
--- a/setup/emacsstuff.el
+++ b/setup/emacsstuff.el
@@ -1,15 +1,51 @@
-(let ((dir (concat (file-name-directory\r
-                    (directory-file-name\r
-                     (file-name-directory (or load-file-name\r
-                                         (when (boundp 'bytecomp-filename) bytecomp-filename)\r
-                                         buffer-file-name))))\r
-                   (file-name-as-directory "emacsstuff"))))\r
-  (add-to-list 'load-path dir))\r
-\r
-(require 'g0dilstuff-init)\r
-(require 'cc-ide)\r
-(require 'softtext)\r
-(require 'cc-mode)\r
-\r
-(define-key c++-mode-map "\C-c\C-c" 'recompile)\r
-(define-key c++-mode-map "\C-c\C-i" 'comment-indent)\r
+(let ((dir (concat (file-name-directory
+                    (directory-file-name
+                     (file-name-directory (or load-file-name
+                                         (when (boundp 'bytecomp-filename) bytecomp-filename)
+                                         buffer-file-name))))
+                   (file-name-as-directory "emacsstuff"))))
+  (add-to-list 'load-path dir))
+
+(require 'g0dilstuff-init)
+(require 'cc-ide)
+(require 'softtext)
+(require 'cc-mode)
+
+(define-key c++-mode-map "\C-c\C-c" 'recompile)
+(define-key c++-mode-map "\C-c\C-i" 'comment-indent)
+
+;;; remove some unnecessary compilation error regexp settings which just cause problems
+(setq compilation-error-regexp-alist (delq 'cucumber compilation-error-regexp-alist))
+(setq compilation-error-regexp-alist (delq 'mips-1 compilation-error-regexp-alist))
+
+;;; remove matching whitespace in filenames for 'gnu' style error messages
+(setf (nth 1 (assoc 'gnu compilation-error-regexp-alist-alist))
+      (replace-regexp-in-string (regexp-quote " [^-/\n]\\|") ""
+                                (nth 1 (assoc 'gnu compilation-error-regexp-alist-alist)) t t))
+
+(defun debug-compilation-error-regexps ()
+  (interactive)
+  (save-excursion
+    (save-restriction
+      (beginning-of-line)
+      (narrow-to-region (point) (save-excursion (forward-line 1) (point)))
+      (let ((match (loop for key in compilation-error-regexp-alist
+                         for elt = (assoc key compilation-error-regexp-alist-alist)
+                         if (and elt (re-search-forward (cadr elt) nil t))
+                         thereis key)))
+        (if match
+            (message "compilation-error-regexp-alist-alist key: %s" match)
+          (error "no error line at point"))))))
+
+(defun c++-mode-update-font-lock-keywords ()
+  (font-lock-add-keywords
+   nil '(;; complete some fundamental keywords
+         ;; add the new C++11 keywords
+         ("\\<\\(alignof\\|alignas\\|constexpr\\|decltype\\|noexcept\\|nullptr\\|static_assert\\|thread_local\\|override\\|final\\)\\>" . font-lock-keyword-face)
+         ("\\<\\(char[0-9]+_t\\)\\>" . font-lock-keyword-face)
+         ;; hexadecimal numbers
+         ("\\<0[xX][0-9A-Fa-f]+\\>" . font-lock-constant-face)
+         ;; integer/float/scientific numbers
+         ("\\<[\\-+]*[0-9]*\\.?[0-9]+\\([ulUL]+\\|[eE][\\-+]?[0-9]+\\)?\\>" . font-lock-constant-face))))
+
+(add-hook 'c++-mode-hook 'c++-mode-update-font-lock-keywords t)