[Cmake-commits] CMake branch, next, updated. v2.8.7-2193-g5b6fde5

[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  5b6fde5eadf79d179d592ff977cd081db64f9ecc (commit)
       via  7da35e655047e595b46628c9d5c569b8d71b51c0 (commit)
      from  68e7a89ea1c44f53e146e9e9d6e06d6702b0615a (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5b6fde5eadf79d179d592ff977cd081db64f9ecc
commit 5b6fde5eadf79d179d592ff977cd081db64f9ecc
Merge: 68e7a89 7da35e6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 23 14:03:56 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 23 14:03:56 2012 -0500

    Merge topic 'emacs-mode-indent-issue-12908' into next
    
    7da35e6 cmake-mode.el: Indent after multiline argument (#12908)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7da35e655047e595b46628c9d5c569b8d71b51c0
commit 7da35e655047e595b46628c9d5c569b8d71b51c0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 23 13:59:27 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 23 13:59:27 2012 -0500

    cmake-mode.el: Indent after multiline argument (#12908)
    
    After a multiline argument ending in a non-empty line e.g.
    
     if(TEST)
       set(VAR "
     ...")
       unset(VAR)
     endif()
    
    we previously failed to indent following lines like the "unset".  Use
    cmake-line-starts-inside-string to keep walking back through multiline
    arguments until we find an indented line.
    
    Suggested-by: Christopher Sean Morrison <brlcad at mac.com>

diff --git a/Docs/cmake-mode.el b/Docs/cmake-mode.el
index 2f51f83..4418bfa 100644
--- a/Docs/cmake-mode.el
+++ b/Docs/cmake-mode.el
@@ -99,6 +99,7 @@ set the path with these commands:
     (setq region (buffer-substring-no-properties (point) point-start))
     (while (and (not (bobp))
                 (or (looking-at cmake-regex-blank)
+                    (cmake-line-starts-inside-string)
                     (not (and (string-match cmake-regex-indented region)
                               (= (length region) (match-end 0))))))
       (forward-line -1)

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

Summary of changes:
 Docs/cmake-mode.el |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake