diff options
| author | Julian Schmidt <ju.schmidt@gmx.de> | 2016-03-15 13:39:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-16 17:32:57 (GMT) |
| commit | 9dc384f6627fed111b53d5f9a05af1a86db9ae54 (patch) | |
| tree | 36e21134493391ab9e4877bcc4cfea6bf6be8d39 /Auxiliary | |
| parent | a87253154e15da3f05ec7a4c625caaa0c54a3861 (diff) | |
| download | CMake-9dc384f6627fed111b53d5f9a05af1a86db9ae54.zip CMake-9dc384f6627fed111b53d5f9a05af1a86db9ae54.tar.gz CMake-9dc384f6627fed111b53d5f9a05af1a86db9ae54.tar.bz2 | |
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.
Diffstat (limited to 'Auxiliary')
| -rw-r--r-- | Auxiliary/cmake-mode.el | 3 |
1 files changed, 2 insertions, 1 deletions
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) )) ) |