From 8d6d55b983fb1c1f4cc870195e016380d10fc8dc Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Fri, 4 Apr 2008 21:17:09 +0100 Subject: [PATCH] dot-emacs: Fix calls to mdw-regexps. When I introduced mdw-regexps, I had it take a &rest argument rather than a list of strings, but I didn't make the calls match! I still think I made the right choice, so strip the extra layer of parens on all of the calls. --- dot-emacs.el | 421 +++++++++++++++++++++++++++++------------------------------ 1 file changed, 210 insertions(+), 211 deletions(-) diff --git a/dot-emacs.el b/dot-emacs.el index efb6eb7..3da4450 100644 --- a/dot-emacs.el +++ b/dot-emacs.el @@ -730,113 +730,112 @@ doesn't cope with anything approximating a complicated case." (make-local-variable 'font-lock-keywords) (let ((c-keywords - (mdw-regexps '( - "and" ;C++ - "and_eq" ;C++ - "asm" ;K&R, GCC - "auto" ;K&R, C89 - "bitand" ;C++ - "bitor" ;C++ - "bool" ;C++, C9X macro - "break" ;K&R, C89 - "case" ;K&R, C89 - "catch" ;C++ - "char" ;K&R, C89 - "class" ;C++ - "complex" ;C9X macro, C++ template type - "compl" ;C++ - "const" ;C89 - "const_cast" ;C++ - "continue" ;K&R, C89 - "defined" ;C89 preprocessor - "default" ;K&R, C89 - "delete" ;C++ - "do" ;K&R, C89 - "double" ;K&R, C89 - "dynamic_cast" ;C++ - "else" ;K&R, C89 - ;; "entry" ;K&R -- never used - "enum" ;C89 - "explicit" ;C++ - "export" ;C++ - "extern" ;K&R, C89 - "false" ;C++, C9X macro - "float" ;K&R, C89 - "for" ;K&R, C89 - ;; "fortran" ;K&R - "friend" ;C++ - "goto" ;K&R, C89 - "if" ;K&R, C89 - "imaginary" ;C9X macro - "inline" ;C++, C9X, GCC - "int" ;K&R, C89 - "long" ;K&R, C89 - "mutable" ;C++ - "namespace" ;C++ - "new" ;C++ - "operator" ;C++ - "or" ;C++ - "or_eq" ;C++ - "private" ;C++ - "protected" ;C++ - "public" ;C++ - "register" ;K&R, C89 - "reinterpret_cast" ;C++ - "restrict" ;C9X - "return" ;K&R, C89 - "short" ;K&R, C89 - "signed" ;C89 - "sizeof" ;K&R, C89 - "static" ;K&R, C89 - "static_cast" ;C++ - "struct" ;K&R, C89 - "switch" ;K&R, C89 - "template" ;C++ - "this" ;C++ - "throw" ;C++ - "true" ;C++, C9X macro - "try" ;C++ - "this" ;C++ - "typedef" ;C89 - "typeid" ;C++ - "typeof" ;GCC - "typename" ;C++ - "union" ;K&R, C89 - "unsigned" ;K&R, C89 - "using" ;C++ - "virtual" ;C++ - "void" ;C89 - "volatile" ;C89 - "wchar_t" ;C++, C89 library type - "while" ;K&R, C89 - "xor" ;C++ - "xor_eq" ;C++ - "_Bool" ;C9X - "_Complex" ;C9X - "_Imaginary" ;C9X - "_Pragma" ;C9X preprocessor - "__alignof__" ;GCC - "__asm__" ;GCC - "__attribute__" ;GCC - "__complex__" ;GCC - "__const__" ;GCC - "__extension__" ;GCC - "__imag__" ;GCC - "__inline__" ;GCC - "__label__" ;GCC - "__real__" ;GCC - "__signed__" ;GCC - "__typeof__" ;GCC - "__volatile__" ;GCC - ))) + (mdw-regexps "and" ;C++ + "and_eq" ;C++ + "asm" ;K&R, GCC + "auto" ;K&R, C89 + "bitand" ;C++ + "bitor" ;C++ + "bool" ;C++, C9X macro + "break" ;K&R, C89 + "case" ;K&R, C89 + "catch" ;C++ + "char" ;K&R, C89 + "class" ;C++ + "complex" ;C9X macro, C++ template type + "compl" ;C++ + "const" ;C89 + "const_cast" ;C++ + "continue" ;K&R, C89 + "defined" ;C89 preprocessor + "default" ;K&R, C89 + "delete" ;C++ + "do" ;K&R, C89 + "double" ;K&R, C89 + "dynamic_cast" ;C++ + "else" ;K&R, C89 + ;; "entry" ;K&R -- never used + "enum" ;C89 + "explicit" ;C++ + "export" ;C++ + "extern" ;K&R, C89 + "false" ;C++, C9X macro + "float" ;K&R, C89 + "for" ;K&R, C89 + ;; "fortran" ;K&R + "friend" ;C++ + "goto" ;K&R, C89 + "if" ;K&R, C89 + "imaginary" ;C9X macro + "inline" ;C++, C9X, GCC + "int" ;K&R, C89 + "long" ;K&R, C89 + "mutable" ;C++ + "namespace" ;C++ + "new" ;C++ + "operator" ;C++ + "or" ;C++ + "or_eq" ;C++ + "private" ;C++ + "protected" ;C++ + "public" ;C++ + "register" ;K&R, C89 + "reinterpret_cast" ;C++ + "restrict" ;C9X + "return" ;K&R, C89 + "short" ;K&R, C89 + "signed" ;C89 + "sizeof" ;K&R, C89 + "static" ;K&R, C89 + "static_cast" ;C++ + "struct" ;K&R, C89 + "switch" ;K&R, C89 + "template" ;C++ + "this" ;C++ + "throw" ;C++ + "true" ;C++, C9X macro + "try" ;C++ + "this" ;C++ + "typedef" ;C89 + "typeid" ;C++ + "typeof" ;GCC + "typename" ;C++ + "union" ;K&R, C89 + "unsigned" ;K&R, C89 + "using" ;C++ + "virtual" ;C++ + "void" ;C89 + "volatile" ;C89 + "wchar_t" ;C++, C89 library type + "while" ;K&R, C89 + "xor" ;C++ + "xor_eq" ;C++ + "_Bool" ;C9X + "_Complex" ;C9X + "_Imaginary" ;C9X + "_Pragma" ;C9X preprocessor + "__alignof__" ;GCC + "__asm__" ;GCC + "__attribute__" ;GCC + "__complex__" ;GCC + "__const__" ;GCC + "__extension__" ;GCC + "__imag__" ;GCC + "__inline__" ;GCC + "__label__" ;GCC + "__real__" ;GCC + "__signed__" ;GCC + "__typeof__" ;GCC + "__volatile__" ;GCC + )) (preprocessor-keywords - (mdw-regexps '("assert" "define" "elif" "else" "endif" "error" - "ident" "if" "ifdef" "ifndef" "import" "include" - "line" "pragma" "unassert" "undef" "warning"))) + (mdw-regexps "assert" "define" "elif" "else" "endif" "error" + "ident" "if" "ifdef" "ifndef" "import" "include" + "line" "pragma" "unassert" "undef" "warning")) (objc-keywords - (mdw-regexps '("class" "defs" "encode" "end" "implementation" - "interface" "private" "protected" "protocol" "public" - "selector")))) + (mdw-regexps "class" "defs" "encode" "end" "implementation" + "interface" "private" "protected" "protocol" "public" + "selector"))) (setq font-lock-keywords (list @@ -913,10 +912,10 @@ doesn't cope with anything approximating a complicated case." (make-local-variable 'font-lock-keywords) (let ((c-keywords - (mdw-regexps '("break" "case" "cd" "continue" "define" "default" - "do" "else" "exit" "for" "global" "goto" "help" "if" - "local" "mat" "obj" "print" "quit" "read" "return" - "show" "static" "switch" "while" "write")))) + (mdw-regexps "break" "case" "cd" "continue" "define" "default" + "do" "else" "exit" "for" "global" "goto" "help" "if" + "local" "mat" "obj" "print" "quit" "read" "return" + "show" "static" "switch" "while" "write"))) (setq font-lock-keywords (list @@ -980,17 +979,17 @@ doesn't cope with anything approximating a complicated case." (make-local-variable 'font-lock-keywords) (let ((java-keywords - (mdw-regexps '("abstract" "boolean" "break" "byte" "case" "catch" - "char" "class" "const" "continue" "default" "do" - "double" "else" "extends" "final" "finally" "float" - "for" "goto" "if" "implements" "import" "instanceof" - "int" "interface" "long" "native" "new" "package" - "private" "protected" "public" "return" "short" - "static" "super" "switch" "synchronized" "this" - "throw" "throws" "transient" "try" "void" "volatile" - "while" - - "false" "null" "true")))) + (mdw-regexps "abstract" "boolean" "break" "byte" "case" "catch" + "char" "class" "const" "continue" "default" "do" + "double" "else" "extends" "final" "finally" "float" + "for" "goto" "if" "implements" "import" "instanceof" + "int" "interface" "long" "native" "new" "package" + "private" "protected" "public" "return" "short" + "static" "super" "switch" "synchronized" "this" + "throw" "throws" "transient" "try" "void" "volatile" + "while" + + "false" "null" "true"))) (setq font-lock-keywords (list @@ -1055,22 +1054,22 @@ doesn't cope with anything approximating a complicated case." (make-local-variable 'font-lock-keywords) (let ((csharp-keywords - (mdw-regexps '("abstract" "as" "base" "bool" "break" - "byte" "case" "catch" "char" "checked" - "class" "const" "continue" "decimal" "default" - "delegate" "do" "double" "else" "enum" - "event" "explicit" "extern" "false" "finally" - "fixed" "float" "for" "foreach" "goto" - "if" "implicit" "in" "int" "interface" - "internal" "is" "lock" "long" "namespace" - "new" "null" "object" "operator" "out" - "override" "params" "private" "protected" "public" - "readonly" "ref" "return" "sbyte" "sealed" - "short" "sizeof" "stackalloc" "static" "string" - "struct" "switch" "this" "throw" "true" - "try" "typeof" "uint" "ulong" "unchecked" - "unsafe" "ushort" "using" "virtual" "void" - "volatile" "while" "yield")))) + (mdw-regexps "abstract" "as" "base" "bool" "break" + "byte" "case" "catch" "char" "checked" + "class" "const" "continue" "decimal" "default" + "delegate" "do" "double" "else" "enum" + "event" "explicit" "extern" "false" "finally" + "fixed" "float" "for" "foreach" "goto" + "if" "implicit" "in" "int" "interface" + "internal" "is" "lock" "long" "namespace" + "new" "null" "object" "operator" "out" + "override" "params" "private" "protected" "public" + "readonly" "ref" "return" "sbyte" "sealed" + "short" "sizeof" "stackalloc" "static" "string" + "struct" "switch" "this" "throw" "true" + "try" "typeof" "uint" "ulong" "unchecked" + "unsafe" "ushort" "using" "virtual" "void" + "volatile" "while" "yield"))) (setq font-lock-keywords (list @@ -1132,17 +1131,17 @@ doesn't cope with anything approximating a complicated case." (make-local-variable 'font-lock-keywords) (let ((c-keywords - (mdw-regexps '("BEGIN" "END" "ARGC" "ARGIND" "ARGV" "CONVFMT" - "ENVIRON" "ERRNO" "FIELDWIDTHS" "FILENAME" "FNR" - "FS" "IGNORECASE" "NF" "NR" "OFMT" "OFS" "ORS" "RS" - "RSTART" "RLENGTH" "RT" "SUBSEP" - "atan2" "break" "close" "continue" "cos" "delete" - "do" "else" "exit" "exp" "fflush" "file" "for" "func" - "function" "gensub" "getline" "gsub" "if" "in" - "index" "int" "length" "log" "match" "next" "rand" - "return" "print" "printf" "sin" "split" "sprintf" - "sqrt" "srand" "strftime" "sub" "substr" "system" - "systime" "tolower" "toupper" "while")))) + (mdw-regexps "BEGIN" "END" "ARGC" "ARGIND" "ARGV" "CONVFMT" + "ENVIRON" "ERRNO" "FIELDWIDTHS" "FILENAME" "FNR" + "FS" "IGNORECASE" "NF" "NR" "OFMT" "OFS" "ORS" "RS" + "RSTART" "RLENGTH" "RT" "SUBSEP" + "atan2" "break" "close" "continue" "cos" "delete" + "do" "else" "exit" "exp" "fflush" "file" "for" "func" + "function" "gensub" "getline" "gsub" "if" "in" + "index" "int" "length" "log" "match" "next" "rand" + "return" "print" "printf" "sin" "split" "sprintf" + "sqrt" "srand" "strftime" "sub" "substr" "system" + "systime" "tolower" "toupper" "while"))) (setq font-lock-keywords (list @@ -1196,11 +1195,11 @@ doesn't cope with anything approximating a complicated case." (make-local-variable 'font-lock-keywords) (let ((perl-keywords - (mdw-regexps '("and" "cmp" "continue" "do" "else" "elsif" "eq" - "for" "foreach" "ge" "gt" "goto" "if" - "last" "le" "lt" "local" "my" "ne" "next" "or" - "package" "redo" "require" "return" "sub" - "undef" "unless" "until" "use" "while")))) + (mdw-regexps "and" "cmp" "continue" "do" "else" "elsif" "eq" + "for" "foreach" "ge" "gt" "goto" "if" + "last" "le" "lt" "local" "my" "ne" "next" "or" + "package" "redo" "require" "return" "sub" + "undef" "unless" "until" "use" "while"))) (setq font-lock-keywords (list @@ -1252,11 +1251,11 @@ strip numbers instead." (make-local-variable 'font-lock-keywords) (let ((python-keywords - (mdw-regexps '("and" "as" "assert" "break" "class" "continue" "def" - "del" "elif" "else" "except" "exec" "finally" "for" - "from" "global" "if" "import" "in" "is" "lambda" - "not" "or" "pass" "print" "raise" "return" "try" - "while" "yield")))) + (mdw-regexps "and" "as" "assert" "break" "class" "continue" "def" + "del" "elif" "else" "except" "exec" "finally" "for" + "from" "global" "if" "import" "in" "is" "lambda" + "not" "or" "pass" "print" "raise" "return" "try" + "while" "yield"))) (setq font-lock-keywords (list @@ -1427,28 +1426,28 @@ strip numbers instead." (make-local-variable 'font-lock-keywords) (let ((rexx-keywords - (mdw-regexps '("address" "arg" "by" "call" "digits" "do" "drop" - "else" "end" "engineering" "exit" "expose" "for" - "forever" "form" "fuzz" "if" "interpret" "iterate" - "leave" "linein" "name" "nop" "numeric" "off" "on" - "options" "otherwise" "parse" "procedure" "pull" - "push" "queue" "return" "say" "select" "signal" - "scientific" "source" "then" "trace" "to" "until" - "upper" "value" "var" "version" "when" "while" - "with" - - "abbrev" "abs" "bitand" "bitor" "bitxor" "b2x" - "center" "center" "charin" "charout" "chars" - "compare" "condition" "copies" "c2d" "c2x" - "datatype" "date" "delstr" "delword" "d2c" "d2x" - "errortext" "format" "fuzz" "insert" "lastpos" - "left" "length" "lineout" "lines" "max" "min" - "overlay" "pos" "queued" "random" "reverse" "right" - "sign" "sourceline" "space" "stream" "strip" - "substr" "subword" "symbol" "time" "translate" - "trunc" "value" "verify" "word" "wordindex" - "wordlength" "wordpos" "words" "xrange" "x2b" "x2c" - "x2d")))) + (mdw-regexps "address" "arg" "by" "call" "digits" "do" "drop" + "else" "end" "engineering" "exit" "expose" "for" + "forever" "form" "fuzz" "if" "interpret" "iterate" + "leave" "linein" "name" "nop" "numeric" "off" "on" + "options" "otherwise" "parse" "procedure" "pull" + "push" "queue" "return" "say" "select" "signal" + "scientific" "source" "then" "trace" "to" "until" + "upper" "value" "var" "version" "when" "while" + "with" + + "abbrev" "abs" "bitand" "bitor" "bitxor" "b2x" + "center" "center" "charin" "charout" "chars" + "compare" "condition" "copies" "c2d" "c2x" + "datatype" "date" "delstr" "delword" "d2c" "d2x" + "errortext" "format" "fuzz" "insert" "lastpos" + "left" "length" "lineout" "lines" "max" "min" + "overlay" "pos" "queued" "random" "reverse" "right" + "sign" "sourceline" "space" "stream" "strip" + "substr" "subword" "symbol" "time" "translate" + "trunc" "value" "verify" "word" "wordindex" + "wordlength" "wordpos" "words" "xrange" "x2b" "x2c" + "x2d"))) (setq font-lock-keywords (list @@ -1486,21 +1485,21 @@ strip numbers instead." (make-local-variable 'font-lock-keywords) (let ((sml-keywords - (mdw-regexps '("abstype" "and" "andalso" "as" - "case" - "datatype" "do" - "else" "end" "eqtype" "exception" - "fn" "fun" "functor" - "handle" - "if" "in" "include" "infix" "infixr" - "let" "local" - "nonfix" - "of" "op" "open" "orelse" - "raise" "rec" - "sharing" "sig" "signature" "struct" "structure" - "then" "type" - "val" - "where" "while" "with" "withtype")))) + (mdw-regexps "abstype" "and" "andalso" "as" + "case" + "datatype" "do" + "else" "end" "eqtype" "exception" + "fn" "fun" "functor" + "handle" + "if" "in" "include" "infix" "infixr" + "let" "local" + "nonfix" + "of" "op" "open" "orelse" + "raise" "rec" + "sharing" "sig" "signature" "struct" "structure" + "then" "type" + "val" + "where" "while" "with" "withtype"))) (setq font-lock-keywords (list @@ -1546,11 +1545,11 @@ strip numbers instead." (make-local-variable 'font-lock-keywords) (let ((haskell-keywords - (mdw-regexps '("as" "case" "ccall" "class" "data" "default" - "deriving" "do" "else" "foreign" "hiding" "if" - "import" "in" "infix" "infixl" "infixr" "instance" - "let" "module" "newtype" "of" "qualified" "safe" - "stdcall" "then" "type" "unsafe" "where")))) + (mdw-regexps "as" "case" "ccall" "class" "data" "default" + "deriving" "do" "else" "foreign" "hiding" "if" + "import" "in" "infix" "infixl" "infixr" "instance" + "let" "module" "newtype" "of" "qualified" "safe" + "stdcall" "then" "type" "unsafe" "where"))) (setq font-lock-keywords (list @@ -1758,13 +1757,13 @@ strip numbers instead." (make-local-variable 'font-lock-defaults) (make-local-variable 'message-mode-keywords) (let ((keywords - (mdw-regexps '("array" "bitmap" "callback" "docs[ \t]+enum" - "export" "enum" "fixed-octetstring" "flags" - "harmless" "map" "nested" "optional" - "optional-tagged" "package" "primitive" - "primitive-nullfree" "relaxed[ \t]+enum" - "set" "table" "tagged-optional" "union" - "variadic" "vector" "version" "version-tag")))) + (mdw-regexps "array" "bitmap" "callback" "docs[ \t]+enum" + "export" "enum" "fixed-octetstring" "flags" + "harmless" "map" "nested" "optional" + "optional-tagged" "package" "primitive" + "primitive-nullfree" "relaxed[ \t]+enum" + "set" "table" "tagged-optional" "union" + "variadic" "vector" "version" "version-tag"))) (setq message-mode-keywords (list (list (concat "\\<\\(" keywords "\\)\\>:") @@ -1803,9 +1802,9 @@ strip numbers instead." (setq comment-start "/* ") (setq comment-end " */") (let ((preprocessor-keywords - (mdw-regexps '("assert" "define" "elif" "else" "endif" "error" - "ident" "if" "ifdef" "ifndef" "import" "include" - "line" "pragma" "unassert" "undef" "warning")))) + (mdw-regexps "assert" "define" "elif" "else" "endif" "error" + "ident" "if" "ifdef" "ifndef" "import" "include" + "line" "pragma" "unassert" "undef" "warning"))) (setq message-mode-keywords (append (list (list (concat "^[ \t]*\\#[ \t]*" "\\(include\\|import\\)" @@ -1847,8 +1846,8 @@ strip numbers instead." (make-local-variable 'font-lock-defaults) (make-local-variable 'mallow-driver-mode-keywords) (let ((keywords - (mdw-regexps '("each" "divert" "file" "if" - "perl" "set" "string" "type" "write")))) + (mdw-regexps "each" "divert" "file" "if" + "perl" "set" "string" "type" "write"))) (setq mallow-driver-mode-keywords (list (list (concat "^%\\s *\\(}\\|\\(" keywords "\\)\\>\\).*$") -- 2.11.0