[[ Emacs ]] Refine indentation rules.

Fix indentation at the start of blocks (e.g. if).
Merge pull request #1352 from peter-b/misc-emacs

[[ Emacs ]] Refine indentation rules.