Cosmetics
Restore newline-and-indent for prog-mode
Revert "Restore newline-and-indent for prog-mode"

This reverts commit 06188c43f498e163645785359406788b1c558ba7.
Merge remote-tracking branch 'upstream/master'