[Cmake-commits] CMake branch, next, updated. v3.5.0-483-g915f223

[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  915f223aafe79b19c53cff12bdba9e9d11756cd0 (commit)
       via  9dc384f6627fed111b53d5f9a05af1a86db9ae54 (commit)
      from  9e7ee356efb36298a07889e8c918278342cba5e5 (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=915f223aafe79b19c53cff12bdba9e9d11756cd0
commit 915f223aafe79b19c53cff12bdba9e9d11756cd0
Merge: 9e7ee35 9dc384f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 16 13:33:37 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 16 13:33:37 2016 -0400

    Merge topic 'emacs-mode-help-off-by-one' into next
    
    9dc384f6 cmake-mode.el: Fix help completion item lists with CMake >= 3.0 (#16019)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9dc384f6627fed111b53d5f9a05af1a86db9ae54
commit 9dc384f6627fed111b53d5f9a05af1a86db9ae54
Author:     Julian Schmidt <ju.schmidt at gmx.de>
AuthorDate: Tue Mar 15 09:39:58 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 16 13:32:57 2016 -0400

    cmake-mode.el: Fix help completion item lists with CMake >= 3.0 (#16019)
    
    We run `cmake --help-*-list` to get a list of items for completion.
    Since CMake < 3.0 always printed "cmake version ..." on the first line
    of the output we have previously ignored the first line.  However, CMake
    3.0 and above do not print the version line so we should not ignore the
    first line or we miss one item.
    
    Ideally we should filter the first line out if it is "cmake version ..."
    in order to support CMake < 3.0 cleanly, but at worst the version line
    will show up as a completion option so simply including the first line
    is good enough for now.

diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index 08ac490..d74dba0 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -304,7 +304,8 @@ and store the result as a list in LISTVAR."
           (save-window-excursion
             (cmake-command-run (concat "--help-" listname "-list") nil temp-buffer-name)
             (with-current-buffer temp-buffer-name
-              (set listvar (cdr (split-string (buffer-substring-no-properties (point-min) (point-max)) "\n" t))))))
+              ; FIXME: Ignore first line if it is "cmake version ..." from CMake < 3.0.
+              (set listvar (split-string (buffer-substring-no-properties (point-min) (point-max)) "\n" t)))))
       (symbol-value listvar)
       ))
   )

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

Summary of changes:
 Auxiliary/cmake-mode.el |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake