[Cmake-commits] CMake branch, master, updated. v3.9.2-830-gf5338f7

[Kitware Robot]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, master has been updated
       via  f5338f799df9c465a694829f7a81808dadc67d87 (commit)
       via  0d543589b90cf31c62fdeecc61cf9504a8de047d (commit)
      from  14ffd3b7e9377e8a2ea4a187ebe6517f20721ed8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f5338f799df9c465a694829f7a81808dadc67d87
commit f5338f799df9c465a694829f7a81808dadc67d87
Merge: 14ffd3b 0d54358
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 18 12:51:53 2017 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Mon Sep 18 08:52:12 2017 -0400

    Merge topic 'revert-vim-no-tabs'
    
    0d543589 vim: Remove default setting of expandtab
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Acked-by: Maurice <m-ou.se at m-ou.se>
    Merge-request: !1273


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d543589b90cf31c62fdeecc61cf9504a8de047d
commit 0d543589b90cf31c62fdeecc61cf9504a8de047d
Author:     Maarten de Vries <maarten at de-vri.es>
AuthorDate: Fri Sep 15 21:51:42 2017 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 18 08:41:53 2017 -0400

    vim: Remove default setting of expandtab
    
    An update from vim-cmake-syntax by commit v3.9.0-rc1~167^2^2
    (vim-cmake-syntax 2017-05-02, 2017-05-02) brought in a change to set
    `expandtab` in CMake language files.  This should be a per-project or
    per-user choice instead, so drop the setting.

diff --git a/Auxiliary/vim/indent/cmake.vim b/Auxiliary/vim/indent/cmake.vim
index 6063e43..76aff64 100644
--- a/Auxiliary/vim/indent/cmake.vim
+++ b/Auxiliary/vim/indent/cmake.vim
@@ -14,7 +14,6 @@ if exists("b:did_indent")
 endif
 let b:did_indent = 1
 
-setlocal et
 setlocal indentexpr=CMakeGetIndent(v:lnum)
 setlocal indentkeys+==ENDIF(,ENDFOREACH(,ENDMACRO(,ELSE(,ELSEIF(,ENDWHILE(
 

-----------------------------------------------------------------------

Summary of changes:
 Auxiliary/vim/indent/cmake.vim |    1 -
 1 file changed, 1 deletion(-)


hooks/post-receive
-- 
CMake