[Cmake-commits] CMake branch, next, updated. v3.1.0-2135-ga63d44a

[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  a63d44a18e1b3090f7f6c50d4fbca8fdc779a7cd (commit)
       via  ca80598ecaff14414193fd65268f80e1eddb9fa0 (commit)
      from  ed798181b088d99d1e6dd4c29b756af6d6d34b22 (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=a63d44a18e1b3090f7f6c50d4fbca8fdc779a7cd
commit a63d44a18e1b3090f7f6c50d4fbca8fdc779a7cd
Merge: ed79818 ca80598
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jan 19 09:28:09 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jan 19 09:28:09 2015 -0500

    Merge topic 'emacs-mode-fix-word-at-point' into next
    
    ca80598e cmake-mode.el: Fix extracting keyword at point in cmake-help


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca80598ecaff14414193fd65268f80e1eddb9fa0
commit ca80598ecaff14414193fd65268f80e1eddb9fa0
Author:     Peter Vasil <mail at petervasil.net>
AuthorDate: Sun Jan 18 01:27:28 2015 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jan 19 09:14:10 2015 -0500

    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 '_'.

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"))

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

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


hooks/post-receive
-- 
CMake