Merge topic 'emacs-indent-close-parens'

bc690f89f5 cmake-mode.el: Fix indentation of 'closing parens only lines'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7089