[emacs] newline after parenthesis should be indented
Three-way merge