                                         (access-label . (after))
                                         (access-key . (after))
                                         (member-init-intro . (after))))
-      (c-cleanup-list                . (scope-operator
+      (c-cleanup-list                . (brace-else-brace
+                                        brace-elseif-brace
+                                        brace-catch-brace
                                         list-close-comma
                                         defun-close-semi
-                                        compact-empty-funcall))
+                                        empty-defun-braces
+                                        scope-operator))
       (c-offsets-alist               . ((arglist-close           .  4)
                                         (label                   . -4)
                                         (access-label            . -4)

                          (substatement-open . 0)
                          (substatement-label . 0)
                          (label . 0)
                          (statement-cont . +)))))

  (defconst user/webkit-style
    '((c-basic-offset . 4)

                          (topmost-intro-cont      .  0)
                          (knr-argdecl-intro       . -4)
                          (brace-list-open         .  0)
                          (brace-list-intro        .  4)))
      (c-cleanup-list  . (brace-else-brace
                          brace-elseif-brace
                          brace-catch-brace
                          list-close-comma
                          defun-close-semi
                          empty-defun-braces
                          scope-operator
                          compact-empty-funcall))))

  (defun user/c-mode-common-hook ()
    "Hook for C/C++ mode."
    (c-toggle-auto-newline t)
    (c-toggle-syntactic-indentation t)

    (modify-syntax-entry ?' ".")
