diff --git a/.emacs-dirvars b/.emacs-dirvars
index d46a88515..a2fb0f1af 100644
--- a/.emacs-dirvars
+++ b/.emacs-dirvars
@@ -6,67 +6,4 @@
 indent-tabs-mode: nil
 tab-width: 8
 c-basic-offset: 2
-c-offsets-alist: ((string . c-lineup-dont-change)
-	       (c . c-lineup-C-comments)
-	       (defun-open . 0)
-	       (defun-close . 0)
-	       (defun-block-intro . +)
-	       (class-open . 0)
-	       (class-close . 0)
-	       (inline-close . 0)
-	       (func-decl-cont . +)
-	       (knr-argdecl . 0)
-	       (topmost-intro . 0)
-	       (topmost-intro-cont . 0)
-	       (member-init-intro . +)
-	       (member-init-cont . c-lineup-multi-inher)
-	       (inher-intro . +)
-	       (inher-cont . c-lineup-multi-inher)
-	       (block-open . 0)
-	       (block-close . 0)
-	       (brace-list-close . 0)
-	       (brace-list-intro . +)
-	       (brace-list-entry . 0)
-	       (brace-entry-open . 0)
-	       (statement . 0)
-	       (statement-case-intro . +)
-	       (substatement . +)
-	       (case-label . 0)
-	       (access-label . -)
-	       (do-while-closure . 0)
-	       (else-clause . 0)
-	       (catch-clause . 0)
-	       (comment-intro . c-lineup-comment)
-	       (arglist-cont . 0)
-	       (arglist-cont-nonempty . c-lineup-arglist)
-	       (stream-op . c-lineup-streamop)
-	       (inclass . +)
-	       (cpp-macro .
-			  [0])
-	       (cpp-macro-cont . c-lineup-dont-change)
-	       (friend . 0)
-	       (objc-method-intro .
-				  [0])
-	       (objc-method-args-cont . c-lineup-ObjC-method-args)
-	       (objc-method-call-cont . c-lineup-ObjC-method-call)
-	       (extern-lang-open . 0)
-	       (extern-lang-close . 0)
-	       (inextern-lang . +)
-	       (namespace-open . 0)
-	       (namespace-close . 0)
-	       (innamespace . 0)
-	       (template-args-cont c-lineup-template-args +)
-	       (inlambda . c-lineup-inexpr-block)
-	       (lambda-intro-cont . +)
-	       (inexpr-statement . 0)
-	       (inexpr-class . +)
-	       (statement-block-intro . +)
-	       (knr-argdecl-intro . +)
-	       (substatement-open . 0)
-	       (label . 0)
-	       (statement-case-open . 0)
-	       (statement-cont . c-lineup-math)
-	       (arglist-intro . +)
-	       (arglist-close . +)
-	       (inline-open . +)
-	       (brace-list-open . 0))
+evaluate: (c-set-offset 'innamespace '0)