[Cmake-commits] CMake branch, next, updated. v3.6.1-1019-gb76fd38

[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  b76fd38ba8d4718faa0e0766823bbaefaa3af5c5 (commit)
       via  b8ef638e8d7bccb3109e87770f9ac6a4b3482726 (commit)
       via  ca684ccb467d35cbebf7374746509788a5eb917d (commit)
      from  55ac87c6778b86f37338db13a2acbf052fc7c8e4 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b76fd38ba8d4718faa0e0766823bbaefaa3af5c5
commit b76fd38ba8d4718faa0e0766823bbaefaa3af5c5
Merge: 55ac87c b8ef638
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 1 15:13:31 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 1 15:13:31 2016 -0400

    Merge topic 'emacs-mode-compilation-warning' into next
    
    b8ef638e cmake-model.el: Replace use of obsolete function (since Emacs 24.3).
    ca684ccb cmake-mode.el: Fix byte-compilation warnings.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b8ef638e8d7bccb3109e87770f9ac6a4b3482726
commit b8ef638e8d7bccb3109e87770f9ac6a4b3482726
Author:     Jostein Kjønigsen <jostein at kjonigsen.net>
AuthorDate: Mon Jul 25 10:13:38 2016 +0200
Commit:     Jostein Kjønigsen <jostein at kjonigsen.net>
CommitDate: Tue Jul 26 14:41:02 2016 +0200

    cmake-model.el: Replace use of obsolete function (since Emacs 24.3).

diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index b35d369..f29b59b 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -271,7 +271,7 @@ optional argument topic will be appended to the argument list."
     (save-selected-window
       (select-window (display-buffer buffer 'not-this-window))
       (cmake-mode)
-      (toggle-read-only t))
+      (read-only-mode 1))
     )
   )
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ca684ccb467d35cbebf7374746509788a5eb917d
commit ca684ccb467d35cbebf7374746509788a5eb917d
Author:     Jostein Kjønigsen <jostein at kjonigsen.net>
AuthorDate: Mon Jul 25 09:56:49 2016 +0200
Commit:     Jostein Kjønigsen <jostein at kjonigsen.net>
CommitDate: Tue Jul 26 14:41:02 2016 +0200

    cmake-mode.el: Fix byte-compilation warnings.

diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index 20def8b..b35d369 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -114,6 +114,14 @@ set the path with these commands:
 ;------------------------------------------------------------------------------
 
 ;;
+;; Indentation increment.
+;;
+(defcustom cmake-tab-width 2
+  "Number of columns to indent cmake blocks"
+  :type 'integer
+  :group 'cmake)
+
+;;
 ;; Line indentation function.
 ;;
 (defun cmake-indent ()
@@ -225,13 +233,6 @@ the indentation.  Otherwise it retains the same position on the line"
 ;;
 (defvar cmake-mode-hook nil)
 
-;;
-;; Indentation increment.
-;;
-(defcustom cmake-tab-width 2
-  "Number of columns to indent cmake blocks"
-  :type 'integer)
-
 ;------------------------------------------------------------------------------
 
 ;; For compatibility with Emacs < 24

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

Summary of changes:
 Auxiliary/cmake-mode.el |   17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake