[Cmake-commits] CMake branch, next, updated. v2.8.12.1-6608-gf037b46

[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  f037b46b8b50b4b639356fb82d321e2d8bf59af1 (commit)
       via  33fa10f6bcd15543845a9870bd1f0edee1b82acb (commit)
       via  d03a0fb409bcd5dedd316d217bf6dc336f105139 (commit)
      from  a2fd265845bb3b5777d3fb54d45e196a8eb140e7 (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=f037b46b8b50b4b639356fb82d321e2d8bf59af1
commit f037b46b8b50b4b639356fb82d321e2d8bf59af1
Merge: a2fd265 33fa10f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 2 13:23:07 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 2 13:23:07 2014 -0500

    Merge topic 'cmake-mode-updates' into next
    
    33fa10f cmake-mode.el: Add autoload cookies
    d03a0fb cmake-mode.el: Move header line to the top of file


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33fa10f6bcd15543845a9870bd1f0edee1b82acb
commit 33fa10f6bcd15543845a9870bd1f0edee1b82acb
Author:     Yasuyuki Oka <yasuyk at gmail.com>
AuthorDate: Sat Dec 28 17:51:32 2013 +0900
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 2 13:15:58 2014 -0500

    cmake-mode.el: Add autoload cookies

diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index 902f753..9c73647 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -23,10 +23,6 @@
 ;;
 ;;  (setq load-path (cons (expand-file-name "/dir/with/cmake-mode") load-path))
 ;;  (require 'cmake-mode)
-;;  (setq auto-mode-alist
-;;        (append '(("CMakeLists\\.txt\\'" . cmake-mode)
-;;                  ("\\.cmake\\'" . cmake-mode))
-;;                auto-mode-alist))
 
 ;------------------------------------------------------------------------------
 
@@ -236,6 +232,7 @@ the indentation.  Otherwise it retains the same position on the line"
 ;;
 ;; CMake mode startup function.
 ;;
+;;;###autoload
 (defun cmake-mode ()
   "Major mode for editing CMake listfiles."
   (interactive)
@@ -270,6 +267,7 @@ the indentation.  Otherwise it retains the same position on the line"
 ; Help mode starts here
 
 
+;;;###autoload
 (defun cmake-command-run (type &optional topic)
   "Runs the command cmake with the arguments specified.  The
 optional argument topic will be appended to the argument list."
@@ -303,6 +301,7 @@ optional argument topic will be appended to the argument list."
     )
   )
 
+;;;###autoload
 (defun cmake-help-list-commands ()
   "Prints out a list of the cmake commands."
   (interactive)
@@ -312,6 +311,7 @@ optional argument topic will be appended to the argument list."
 (defvar cmake-help-command-history nil "Topic read history.")
 
 (require 'thingatpt)
+;;;###autoload
 (defun cmake-get-topic (type)
   "Gets the topic from the minibuffer input.  The default is the word the cursor is on."
   (interactive)
@@ -328,6 +328,7 @@ optional argument topic will be appended to the argument list."
   )
 
 
+;;;###autoload
 (defun cmake-help-command ()
   "Prints out the help message corresponding to the command the cursor is on."
   (interactive)
@@ -335,6 +336,10 @@ optional argument topic will be appended to the argument list."
   (cmake-command-run "--help-command" (downcase command))
   )
 
+;;;###autoload
+(progn
+  (add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
+  (add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode)))
 
 ; This file provides cmake-mode.
 (provide 'cmake-mode)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d03a0fb409bcd5dedd316d217bf6dc336f105139
commit d03a0fb409bcd5dedd316d217bf6dc336f105139
Author:     Yasuyuki Oka <yasuyk at gmail.com>
AuthorDate: Sat Dec 28 17:38:49 2013 +0900
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jan 2 13:14:15 2014 -0500

    cmake-mode.el: Move header line to the top of file

diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index 79d2319..902f753 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -1,3 +1,5 @@
+;;; cmake-mode.el --- major-mode for editing CMake sources
+
 ;=============================================================================
 ; CMake - Cross Platform Makefile Generator
 ; Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
@@ -9,7 +11,6 @@
 ; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 ; See the License for more information.
 ;=============================================================================
-;;; cmake-mode.el --- major-mode for editing CMake sources
 
 ;------------------------------------------------------------------------------
 

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

Summary of changes:
 Auxiliary/cmake-mode.el |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake