From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 15 Dec 2015 19:15:23 +0000 (+0000)
Subject: el/dot-emacs.el (mdw-fontify-c-and-c++): Fix the <iso646.h> macros.
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/commitdiff_plain/0681f29e9f442dc7f1eb6e30b3e9051d1f159e38

el/dot-emacs.el (mdw-fontify-c-and-c++): Fix the <iso646.h> macros.

Mark them as being introduced to C by C95.  Add `not' and `not_eq',
which were in the original C++ standard but mistakenly not listed.
---

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 0719c0a..8bf7d9e 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1333,12 +1333,12 @@ (defun mdw-fontify-c-and-c++ ()
   ;; Now define things to be fontified.
   (make-local-variable 'font-lock-keywords)
   (let ((c-keywords
-	 (mdw-regexps "and"		 ;C++
-		      "and_eq"		 ;C++
+	 (mdw-regexps "and"		 ;C++, C95 macro
+		      "and_eq"		 ;C++, C95 macro
 		      "asm"		 ;K&R, GCC
 		      "auto"		 ;K&R, C89
-		      "bitand"		 ;C++
-		      "bitor"		 ;C++
+		      "bitand"		 ;C++, C95 macro
+		      "bitor"		 ;C++, C95 macro
 		      "bool"		 ;C++, C99 macro
 		      "break"		 ;K&R, C89
 		      "case"		 ;K&R, C89
@@ -1346,7 +1346,7 @@ (defun mdw-fontify-c-and-c++ ()
 		      "char"		 ;K&R, C89
 		      "class"		 ;C++
 		      "complex"		 ;C99 macro, C++ template type
-		      "compl"		 ;C++
+		      "compl"		 ;C++, C95 macro
 		      "const"		 ;C89
 		      "const_cast"	 ;C++
 		      "continue"	 ;K&R, C89
@@ -1375,9 +1375,11 @@ (defun mdw-fontify-c-and-c++ ()
 		      "mutable"		 ;C++
 		      "namespace"	 ;C++
 		      "new"		 ;C++
+		      "not"		 ;C++, C95 macro
+		      "not_eq"		 ;C++, C95 macro
 		      "operator"	 ;C++
-		      "or"		 ;C++
-		      "or_eq"		 ;C++
+		      "or"		 ;C++, C95 macro
+		      "or_eq"		 ;C++, C95 macro
 		      "private"		 ;C++
 		      "protected"	 ;C++
 		      "public"		 ;C++
@@ -1408,8 +1410,8 @@ (defun mdw-fontify-c-and-c++ ()
 		      "volatile"	 ;C89
 		      "wchar_t"		 ;C++, C89 library type
 		      "while"		 ;K&R, C89
-		      "xor"		 ;C++
-		      "xor_eq"		 ;C++
+		      "xor"		 ;C++, C95 macro
+		      "xor_eq"		 ;C++, C95 macro
 		      "_Bool"		 ;C99
 		      "_Complex"	 ;C99
 		      "_Imaginary"	 ;C99