X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/c9f00bd07474abfc4dccad6ae9f6f72b5baee4f2..f7876fa90d96da9312ae563b89e16ed955ca5b19:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 19d594d..11be2ac 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1173,7 +1173,7 @@ doesn't match any of the regular expressions in
   (t :foreground "SkyBlue1"))
 (mdw-define-face magit-item-highlight
   (((type tty)) :background "blue")
-  (t :background "DarkSeaGreen4"))
+  (t :background "grey11"))
 (mdw-define-face magit-log-head-label-remote
   (((type tty)) :background "cyan" :foreground "green")
   (t :background "grey11" :foreground "DarkSeaGreen2" :box t))
@@ -1333,9 +1333,12 @@ doesn't match any of the regular expressions in
   ;; Now define things to be fontified.
   (make-local-variable 'font-lock-keywords)
   (let ((c-keywords
-	 (mdw-regexps "and"		 ;C++, C95 macro
+	 (mdw-regexps "alignas"		 ;C11 macro, C++11
+		      "alignof"		 ;C++11
+		      "and"		 ;C++, C95 macro
 		      "and_eq"		 ;C++, C95 macro
 		      "asm"		 ;K&R, C++, GCC
+		      "atomic"		 ;C11 macro, C++11 template type
 		      "auto"		 ;K&R, C89
 		      "bitand"		 ;C++, C95 macro
 		      "bitor"		 ;C++, C95 macro
@@ -1344,12 +1347,16 @@ doesn't match any of the regular expressions in
 		      "case"		 ;K&R, C89
 		      "catch"		 ;C++
 		      "char"		 ;K&R, C89
+		      "char16_t"	 ;C++11, C11 library type
+		      "char32_t"	 ;C++11, C11 library type
 		      "class"		 ;C++
 		      "complex"		 ;C99 macro, C++ template type
 		      "compl"		 ;C++, C95 macro
 		      "const"		 ;C89
+		      "constexpr"	 ;C++11
 		      "const_cast"	 ;C++
 		      "continue"	 ;K&R, C89
+		      "decltype"	 ;C++11
 		      "defined"		 ;C89 preprocessor
 		      "default"		 ;K&R, C89
 		      "delete"		 ;C++
@@ -1375,8 +1382,11 @@ doesn't match any of the regular expressions in
 		      "mutable"		 ;C++
 		      "namespace"	 ;C++
 		      "new"		 ;C++
+		      "noexcept"	 ;C++11
+		      "noreturn"	 ;C11 macro
 		      "not"		 ;C++, C95 macro
 		      "not_eq"		 ;C++, C95 macro
+		      "nullptr"		 ;C++11
 		      "operator"	 ;C++
 		      "or"		 ;C++, C95 macro
 		      "or_eq"		 ;C++, C95 macro
@@ -1391,12 +1401,14 @@ doesn't match any of the regular expressions in
 		      "signed"		 ;C89
 		      "sizeof"		 ;K&R, C89
 		      "static"		 ;K&R, C89
+		      "static_assert"	 ;C11 macro, C++11
 		      "static_cast"	 ;C++
 		      "struct"		 ;K&R, C89
 		      "switch"		 ;K&R, C89
 		      "template"	 ;C++
 		      "throw"		 ;C++
 		      "try"		 ;C++
+		      "thread_local"	 ;C11 macro, C++11
 		      "typedef"		 ;C89
 		      "typeid"		 ;C++
 		      "typeof"		 ;GCC
@@ -1411,10 +1423,17 @@ doesn't match any of the regular expressions in
 		      "while"		 ;K&R, C89
 		      "xor"		 ;C++, C95 macro
 		      "xor_eq"		 ;C++, C95 macro
+		      "_Alignas"	 ;C11
+		      "_Alignof"	 ;C11
+		      "_Atomic"		 ;C11
 		      "_Bool"		 ;C99
 		      "_Complex"	 ;C99
+		      "_Generic"	 ;C11
 		      "_Imaginary"	 ;C99
+		      "_Noreturn"	 ;C11
 		      "_Pragma"		 ;C99 preprocessor
+		      "_Static_assert"	 ;C11
+		      "_Thread_local"	 ;C11
 		      "__alignof__"	 ;GCC
 		      "__asm__"		 ;GCC
 		      "__attribute__"	 ;GCC
@@ -2720,6 +2739,10 @@ strip numbers instead."
   (modify-syntax-entry ?$ "." font-lock-syntax-table)
   (local-set-key [?$] 'self-insert-command)
 
+  ;; Make `tab' be useful, given that tab stops in TeX don't work well.
+  (local-set-key "\C-i" 'indent-relative)
+  (setq indent-tabs-mode nil)
+
   ;; Set fill prefix.
   (mdw-standard-fill-prefix "\\([ \t]*%+[ \t]*\\)")