chiark / gitweb /
el/dot-emacs.el (mdw-fontify-c-and-c++): Fix the <iso646.h> macros.
authorMark Wooding <mdw@distorted.org.uk>
Tue, 15 Dec 2015 19:15:23 +0000 (19:15 +0000)
committerMark Wooding <mdw@distorted.org.uk>
Sat, 16 Jan 2016 02:56:11 +0000 (02:56 +0000)
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.

el/dot-emacs.el

index 0719c0a4570a7b7baafdc2ef88b8892d04ca13c8..8bf7d9ea9c9d743c09fb4813a552b5272c8a0e79 100644 (file)
@@ -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
   ;; 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
                      "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
                      "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
                      "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
                      "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++
                      "mutable"          ;C++
                      "namespace"        ;C++
                      "new"              ;C++
+                     "not"              ;C++, C95 macro
+                     "not_eq"           ;C++, C95 macro
                      "operator"         ;C++
                      "operator"         ;C++
-                     "or"               ;C++
-                     "or_eq"            ;C++
+                     "or"               ;C++, C95 macro
+                     "or_eq"            ;C++, C95 macro
                      "private"          ;C++
                      "protected"        ;C++
                      "public"           ;C++
                      "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
                      "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
                      "_Bool"            ;C99
                      "_Complex"         ;C99
                      "_Imaginary"       ;C99