Formatting change.
Tweak asm-mode to indent idempotently.
Merge branch 'emacs-update' into ubuntu