[Cmake-commits] CMake branch, next, updated. v3.6.1-1124-g721ea79

[Brad King]

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, next has been updated
       via  721ea794cd31ba2c2e96d35eb7b15d97db5c4642 (commit)
       via  fe7f117ad22c1f2884c47cb961ea33f1c88206a4 (commit)
      from  3e5ed14eddd17e6f98aa6c3acdc342d4cb2b9c8a (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=721ea794cd31ba2c2e96d35eb7b15d97db5c4642
commit 721ea794cd31ba2c2e96d35eb7b15d97db5c4642
Merge: 3e5ed14 fe7f117
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Aug 5 08:55:00 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 5 08:55:00 2016 -0400

    Merge topic 'bash-completion-fix-E-lookup' into next
    
    fe7f117a bash-completion: Fix cmake -E lookup


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fe7f117ad22c1f2884c47cb961ea33f1c88206a4
commit fe7f117ad22c1f2884c47cb961ea33f1c88206a4
Author:     Sylvain Joubert <joubert.sy at gmail.com>
AuthorDate: Thu Aug 4 18:59:21 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Aug 5 08:54:09 2016 -0400

    bash-completion: Fix cmake -E lookup
    
    In case of long '<command> <args...>' the description text is wrapped
    and indented on the next line.
    Avoid taking these lines into account by explicitly requiring the third
    character to be a non-space.

diff --git a/Auxiliary/bash-completion/cmake b/Auxiliary/bash-completion/cmake
index 6061129..0a862fa 100644
--- a/Auxiliary/bash-completion/cmake
+++ b/Auxiliary/bash-completion/cmake
@@ -102,7 +102,7 @@ _cmake()
             ;;
         -E)
             COMPREPLY=( $( compgen -W "$( cmake -E help |& sed -n \
-                '/^  /{s|^  \([^ ]\{1,\}\) .*$|\1|;p}' 2>/dev/null )" \
+                '/^  [^ ]/{s|^  \([^ ]\{1,\}\) .*$|\1|;p}' 2>/dev/null )" \
                 -- "$cur" ) )
             return
             ;;

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

Summary of changes:
 Auxiliary/bash-completion/cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake