X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/e555fac76a951f1433487e5215966aee640b9407..4b7a0fa89382f7d07d5b886712c4fb2eba8911b7:/el/dot-emacs.el

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 50ffcfa..5d47344 100644
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -100,11 +100,11 @@ This may be at the expense of cool features.")
 		     (replace-match with t))))
 	    (with-temp-buffer
 	      (insert-file-contents "~/.mdw.conf")
-	      (replace  "^[ \t]*\\(#.*\\|\\)\n" "")
+	      (replace  "^[ \t]*\\(#.*\\)?\n" "")
 	      (replace (concat "^[ \t]*"
 			       "\\([-a-zA-Z0-9_.]*\\)"
 			       "[ \t]*=[ \t]*"
-			       "\\(.*[^ \t\n]\\|\\)"
+			       "\\(.*[^ \t\n]\\)?"
 			       "[ \t]**\\(\n\\|$\\)")
 		       "(\\1 . \"\\2\")\n")
 	      (car (read-from-string
@@ -2001,12 +2001,11 @@ set."
 	 (func (intern (concat "mdw-define-c-style/" name-string))))
     `(progn
        (setq ,var
-	     ',(if (null parent)
-		   assocs
-		 (let ((parent-list (symbol-value
-				     (intern (concat "mdw-c-style/"
-						     (symbol-name parent))))))
-		   (mdw-merge-style-alists assocs parent-list))))
+	     ,(if (null parent)
+		  `',assocs
+		(let ((parent-list (intern (concat "mdw-c-style/"
+						   (symbol-name parent)))))
+		  `(mdw-merge-style-alists ',assocs ,parent-list))))
        (defun ,func () (c-add-style ,name-string ,var))
        (and (featurep 'cc-mode) (,func))
        (add-hook 'mdw-define-c-styles-hook ',func)
@@ -2225,7 +2224,7 @@ name, as a symbol."
 	   ;; Fontify include files as strings.
 	   (list (concat "^[ \t]*\\#[ \t]*"
 			 "\\(include\\|import\\)"
-			 "[ \t]*\\(<[^>]+\\(>\\|\\)\\)")
+			 "[ \t]*\\(<[^>]+>?\\)")
 		 '(2 font-lock-string-face))
 
 	   ;; Preprocessor directives are `references'?.
@@ -2319,7 +2318,7 @@ name, as a symbol."
 
 ;; Make indentation nice.
 
-(mdw-define-c-style mdw-java
+(mdw-define-c-style mdw-java ()
   (c-basic-offset . 2)
   (c-backslash-column . 72)
   (c-offsets-alist (substatement-open . 0)
@@ -2381,8 +2380,8 @@ name, as a symbol."
 	   ;; The following isn't quite right, but it's close enough.
 	   (list (concat "\\<\\("
 			 "0\\([xX][0-9a-fA-F]+\\|[0-7]+\\)\\|"
-			 "[0-9]+\\(\\.[0-9]*\\|\\)"
-			 "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)\\)"
+			 "[0-9]+\\(\\.[0-9]*\\)?"
+			 "\\([eE][-+]?[0-9]+\\)?\\)"
 			 "[lLfFdD]?")
 		 '(0 mdw-number-face))
 
@@ -2440,8 +2439,8 @@ name, as a symbol."
 	   ;; The following isn't quite right, but it's close enough.
 	   (list (concat "\\_<\\("
 			 "0\\([xX][0-9a-fA-F]+\\|[0-7]+\\)\\|"
-			 "[0-9]+\\(\\.[0-9]*\\|\\)"
-			 "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)\\)"
+			 "[0-9]+\\(\\.[0-9]*\\)?"
+			 "\\([eE][-+]?[0-9]+\\)?\\)"
 			 "[lLfFdD]?")
 		 '(0 mdw-number-face))
 
@@ -2498,8 +2497,8 @@ name, as a symbol."
 	   ;; As usual, not quite right.
 	   (list (concat "\\_<\\("
 			 "0\\([xX][0-9a-fA-F]+\\|[0-7]+\\)\\|"
-			 "[0-9]+\\(\\.[0-9]*\\|\\)"
-			 "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)\\)"
+			 "[0-9]+\\(\\.[0-9]*\\)?"
+			 "\\([eE][-+]?[0-9]+\\)?\\)"
 			 "[lLfFdD]?")
 		 '(0 mdw-number-face))
 
@@ -2531,7 +2530,7 @@ name, as a symbol."
 
 ;; Make indentation nice.
 
-(mdw-define-c-style mdw-csharp
+(mdw-define-c-style mdw-csharp ()
   (c-basic-offset . 2)
   (c-backslash-column . 72)
   (c-offsets-alist (substatement-open . 0)
@@ -2585,8 +2584,8 @@ name, as a symbol."
 	   ;; The following isn't quite right, but it's close enough.
 	   (list (concat "\\<\\("
 			 "0\\([xX][0-9a-fA-F]+\\|[0-7]+\\)\\|"
-			 "[0-9]+\\(\\.[0-9]*\\|\\)"
-			 "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)\\)"
+			 "[0-9]+\\(\\.[0-9]*\\)?"
+			 "\\([eE][-+]?[0-9]+\\)?\\)"
 			 "[lLfFdD]?")
 		 '(0 mdw-number-face))
 
@@ -2777,8 +2776,8 @@ name, as a symbol."
 	   ;; The following isn't quite right, but it's close enough.
 	   (list (concat "\\<\\("
 			 "0\\([xX][0-9a-fA-F]+\\|[0-7]+\\)\\|"
-			 "[0-9]+\\(\\.[0-9]*\\|\\)"
-			 "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)\\)")
+			 "[0-9]+\\(\\.[0-9]*\\)?"
+			 "\\([eE][-+]?[0-9]+\\)?\\)")
 		 '(0 mdw-number-face))
 
 	   ;; And anything else is punctuation.
@@ -2876,7 +2875,7 @@ name, as a symbol."
 
 ;; Make Awk indentation nice.
 
-(mdw-define-c-style mdw-awk
+(mdw-define-c-style mdw-awk ()
   (c-basic-offset . 2)
   (c-offsets-alist (substatement-open . 0)
 		   (c-backslash-column . 72)
@@ -2918,8 +2917,8 @@ name, as a symbol."
 	   ;; The following isn't quite right, but it's close enough.
 	   (list (concat "\\<\\("
 			 "0\\([xX][0-9a-fA-F]+\\|[0-7]+\\)\\|"
-			 "[0-9]+\\(\\.[0-9]*\\|\\)"
-			 "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)\\)"
+			 "[0-9]+\\(\\.[0-9]*\\)?"
+			 "\\([eE][-+]?[0-9]+\\)?\\)"
 			 "[uUlL]*")
 		 '(0 mdw-number-face))
 
@@ -2985,8 +2984,8 @@ name, as a symbol."
 
 	   ;; At least numbers are simpler than C.
 	   (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
-			 "\\<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
-			 "\\([eE]\\([-+]\\|\\)[0-9_]+\\|\\)")
+			 "\\<[0-9][0-9_]*\\(\\.[0-9_]*\\)?"
+			 "\\([eE][-+]?[0-9_]+\\)?")
 		 '(0 mdw-number-face))
 
 	   ;; And anything else is punctuation.
@@ -3037,8 +3036,8 @@ strip numbers instead."
 
 	 ;; At least numbers are simpler than C.
 	 (list (concat "\\_<0\\([xX][0-9a-fA-F]+\\|[oO]?[0-7]+\\|[bB][01]+\\)\\|"
-		       "\\_<[0-9][0-9]*\\(\\.[0-9]*\\|\\)"
-		       "\\([eE]\\([-+]\\|\\)[0-9]+\\|[lL]\\|\\)")
+		       "\\_<[0-9][0-9]*\\(\\.[0-9]*\\)?"
+		       "\\([eE][-+]?[0-9]+\\|[lL]\\)?")
 	       '(0 mdw-number-face))
 
 	 ;; And anything else is punctuation.
@@ -3223,8 +3222,8 @@ strip numbers instead."
   (setq font-lock-keywords
 	(list
 	 (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
-		       "\\<[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
-		       "\\([eE]\\([-+]\\|\\)[0-9_]+\\|\\)")
+		       "\\<[0-9][0-9_]*\\(\\.[0-9_]*\\)?"
+		       "\\([eE][-+]?[0-9_]+\\)?")
 	       '(0 mdw-number-face))
 	 (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 	       '(0 mdw-punct-face)))))
@@ -3469,12 +3468,12 @@ strip numbers instead."
 		 '(0 font-lock-keyword-face))
 
 	   ;; At least numbers are simpler than C.
-	   (list (concat "\\<\\(\\~\\|\\)"
-			    "\\(0\\(\\([wW]\\|\\)[xX][0-9a-fA-F]+\\|"
+	   (list (concat "\\<\\~?"
+			    "\\(0\\([wW]?[xX][0-9a-fA-F]+\\|"
 				   "[wW][0-9]+\\)\\|"
-				"\\([0-9]+\\(\\.[0-9]+\\|\\)"
-					 "\\([eE]\\(\\~\\|\\)"
-						"[0-9]+\\|\\)\\)\\)")
+				"\\([0-9]+\\(\\.[0-9]+\\)?"
+					 "\\([eE]\\~?"
+						"[0-9]+\\)?\\)\\)")
 		 '(0 mdw-number-face))
 
 	   ;; And anything else is punctuation.
@@ -3559,8 +3558,8 @@ strip numbers instead."
 	   (list "\\_<[A-Z]\\(\\sw+\\|\\s_+\\)*\\_>"
 		 '(0 font-lock-variable-name-face))
 	   (list (concat "\\_<0\\([xX][0-9a-fA-F]+\\|[oO][0-7]+\\)\\|"
-			 "\\_<[0-9]+\\(\\.[0-9]*\\|\\)"
-			 "\\([eE]\\([-+]\\|\\)[0-9]+\\|\\)")
+			 "\\_<[0-9]+\\(\\.[0-9]*\\)?"
+			 "\\([eE][-+]?[0-9]+\\)?")
 		 '(0 mdw-number-face))
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 		 '(0 mdw-punct-face))))))
@@ -3597,7 +3596,7 @@ strip numbers instead."
 		 '(0 font-lock-keyword-face))
 	   (list (concat "^-\\sw+\\>")
 		 '(0 font-lock-keyword-face))
-	   (list "\\<[0-9]+\\(\\|#[0-9a-zA-Z]+\\|[eE][+-]?[0-9]+\\)\\>"
+	   (list "\\<[0-9]+\\(#[0-9a-zA-Z]+\\|[eE][+-]?[0-9]+\\)?\\>"
 		 '(0 mdw-number-face))
 	   (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 		 '(0 mdw-punct-face))))))
@@ -3629,7 +3628,7 @@ strip numbers instead."
 	       '(2 font-lock-variable-name-face))
 
 	 ;; Make sure we get comments properly.
-	 (list "@c\\(\\|omment\\)\\( .*\\)?$"
+	 (list "@c\\(omment\\)?\\( .*\\)?$"
 	       '(0 font-lock-comment-face))
 
 	 ;; Command names are keywords.
@@ -4067,7 +4066,7 @@ that character only to be normal punctuation.")
     (setq messages-mode-keywords
 	  (append (list (list (concat "^[ \t]*\\#[ \t]*"
 				      "\\(include\\|import\\)"
-				      "[ \t]*\\(<[^>]+\\(>\\|\\)\\)")
+				      "[ \t]*\\(<[^>]+\\(>\\)?\\)")
 			      '(2 font-lock-string-face))
 			(list (concat "^\\([ \t]*#[ \t]*\\(\\("
 				      preprocessor-keywords
@@ -4113,7 +4112,7 @@ that character only to be normal punctuation.")
 	  (list
 	   (list (concat "^%\\s *\\(}\\|\\(" keywords "\\)\\>\\).*$")
 		 '(0 font-lock-keyword-face))
-	   (list "^%\\s *\\(#.*\\|\\)$"
+	   (list "^%\\s *\\(#.*\\)?$"
 		 '(0 font-lock-comment-face))
 	   (list "^%"
 		 '(0 font-lock-keyword-face))
@@ -4297,8 +4296,8 @@ that character only to be normal punctuation.")
 	 (list "\\<[A-Z][a-zA-Z0-9]*\\>"
 	       '(0 font-lock-keyword-face))
 	 (list (concat "\\<0\\([xX][0-9a-fA-F_]+\\|[0-7_]+\\)\\|"
-		       "[0-9][0-9_]*\\(\\.[0-9_]*\\|\\)"
-		       "\\([eE]\\([-+]\\|\\)[0-9_]+\\|\\)")
+		       "[0-9][0-9_]*\\(\\.[0-9_]*\\)?"
+		       "\\([eE][-+]?[0-9_]+\\)?")
 	       '(0 mdw-number-face))
 	 (list "\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)"
 	       '(0 mdw-punct-face)))))
@@ -4541,12 +4540,12 @@ there is sadness."
 	 (preloads (save-match-data (split-string old-preload ":")))
 	 (any nil)
 	 (filtered nil))
-    (while preloads
-      (let ((item (pop preloads)))
-	(if (save-match-data
-	      (string-match  "\\(/\\|^\\)noip\.so\\(:\\|$\\)" item))
-	    (setq any t)
-	  (push item filtered))))
+    (save-match-data
+      (while preloads
+	(let ((item (pop preloads)))
+	  (if (string-match  "\\(/\\|^\\)noip\.so\\(:\\|$\\)" item)
+	      (setq any t)
+	    (push item filtered)))))
     (if any
 	(unwind-protect
 	    (progn