el/dot-emacs.el: Hoist `mdw-c' to the top as the primary style.

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index 34df1a0..9803cf0 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -1991,48 +1991,48 @@ set."
 (eval-after-load "cc-mode"
   '(run-hooks 'mdw-define-c-styles-hook))
 
-(mdw-define-c-style mdw-trustonic-c
-  (c-basic-offset . 4)
-  (comment-column . 0)
-  (c-indent-comment-alist (anchored-comment . (column . 0))
-                         (end-block . (space . 1))
-                         (cpp-end-block . (space . 1))
-                         (other . (space . 1)))
+(mdw-define-c-style mdw-c
+  (c-basic-offset . 2)
+  (comment-column . 40)
   (c-class-key . "class")
-  (c-backslash-column . 0)
-  (c-auto-align-backslashes . nil)
+  (c-backslash-column . 72)
   (c-label-minimum-indentation . 0)
   (c-offsets-alist (substatement-open . (add 0 c-indent-one-line-block))
                   (defun-open . (add 0 c-indent-one-line-block))
-                  (arglist-cont-nonempty . mdw-c-indent-arglist-nested)
+                  (arglist-cont-nonempty . mdw-c-lineup-arglist)
                   (topmost-intro . mdw-c-indent-extern-mumble)
                   (cpp-define-intro . 0)
                   (knr-argdecl . 0)
                   (inextern-lang . [0])
                   (label . 0)
                   (case-label . +)
-                  (access-label . -2)
+                  (access-label . -)
                   (inclass . +)
                   (inline-open . ++)
                   (statement-cont . +)
                   (statement-case-intro . +)))
 
-(mdw-define-c-style mdw-c
-  (c-basic-offset . 2)
-  (comment-column . 40)
+(mdw-define-c-style mdw-trustonic-c
+  (c-basic-offset . 4)
+  (comment-column . 0)
+  (c-indent-comment-alist (anchored-comment . (column . 0))
+                         (end-block . (space . 1))
+                         (cpp-end-block . (space . 1))
+                         (other . (space . 1)))
   (c-class-key . "class")
-  (c-backslash-column . 72)
+  (c-backslash-column . 0)
+  (c-auto-align-backslashes . nil)
   (c-label-minimum-indentation . 0)
   (c-offsets-alist (substatement-open . (add 0 c-indent-one-line-block))
                   (defun-open . (add 0 c-indent-one-line-block))
-                  (arglist-cont-nonempty . mdw-c-lineup-arglist)
+                  (arglist-cont-nonempty . mdw-c-indent-arglist-nested)
                   (topmost-intro . mdw-c-indent-extern-mumble)
                   (cpp-define-intro . 0)
                   (knr-argdecl . 0)
                   (inextern-lang . [0])
                   (label . 0)
                   (case-label . +)
-                  (access-label . -)
+                  (access-label . -2)
                   (inclass . +)
                   (inline-open . ++)
                   (statement-cont . +)