summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Vasil <mail@petervasil.net>2015-01-18 00:27:28 (GMT)
committerBrad King <brad.king@kitware.com>2015-01-19 14:14:10 (GMT)
commitca80598ecaff14414193fd65268f80e1eddb9fa0 (patch)
treed1f4136734bcee6c6b4dbc72957e258603b60c16
parent30f14aebeee90bc1af6236888599db86b2bd8fae (diff)
downloadCMake-ca80598ecaff14414193fd65268f80e1eddb9fa0.zip
CMake-ca80598ecaff14414193fd65268f80e1eddb9fa0.tar.gz
CMake-ca80598ecaff14414193fd65268f80e1eddb9fa0.tar.bz2
cmake-mode.el: Fix extracting keyword at point in cmake-help
Since commit v3.1.0-rc2~1^2~1 (cmake-mode.el: syntax of '_' should be treated as symbol, 2014-11-12) the 'word-at-point' function does not extract the whole keyword anymore if it contains an '_', because 'forward-word' stops at '_'. Use 'symbol-at-point' to extract a whole keyword even if there is an '_'.
-rw-r--r--Auxiliary/cmake-mode.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index f1470f3..37ca942 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -320,9 +320,13 @@ and store the result as a list in LISTVAR."
))
)
-(require 'thingatpt)
+(defun cmake-symbol-at-point ()
+ (let ((symbol (symbol-at-point)))
+ (and (not (null symbol))
+ (symbol-name symbol))))
+
(defun cmake-help-type (type)
- (let* ((default-entry (word-at-point))
+ (let* ((default-entry (cmake-symbol-at-point))
(history (car (cdr (cdr (assoc type cmake-string-to-list-symbol)))))
(input (completing-read
(format "CMake %s: " type) ; prompt
@@ -365,7 +369,7 @@ and store the result as a list in LISTVAR."
(defun cmake-help ()
"Queries for any of the four available help topics and prints out the approriate page."
(interactive)
- (let* ((default-entry (word-at-point))
+ (let* ((default-entry (cmake-symbol-at-point))
(command-list (cmake-get-list "command"))
(variable-list (cmake-get-list "variable"))
(module-list (cmake-get-list "module"))