Merge topic 'emacs-mode-fix-word-at-point'

3a147e1b cmake-mode.el: Re-add explicit call to require thingatpt

Auxiliary/cmake-mode.el

@@ -320,6 +320,7 @@ 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))