Change .dir-locals.el to use the new indentation settings.

(cherry picked from commit 2b55ee187786ec00e50c3ef568c1b958988e0c8e)
More finer-grained style definition for Emacs.

(cherry picked from commit 640befef2f6acafcced8f472c32cecdffb68c484)