summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-03-17 13:41:34 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2016-03-17 13:41:34 (GMT)
commitf6d66b04a36c263d8cc6c01d9b628168dae42d85 (patch)
tree603479963b6ac7f64b96763d4f613fe37153ccb9
parentd9fc4dfe3c0d2857018758649f9d5f780b22e333 (diff)
parent9dc384f6627fed111b53d5f9a05af1a86db9ae54 (diff)
downloadCMake-f6d66b04a36c263d8cc6c01d9b628168dae42d85.zip
CMake-f6d66b04a36c263d8cc6c01d9b628168dae42d85.tar.gz
CMake-f6d66b04a36c263d8cc6c01d9b628168dae42d85.tar.bz2
Merge topic 'emacs-mode-help-off-by-one'
9dc384f6 cmake-mode.el: Fix help completion item lists with CMake >= 3.0 (#16019)
-rw-r--r--Auxiliary/cmake-mode.el3
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)
))
)