[Cmake-commits] CMake branch, next, updated. v2.8.9-654-gf321a20

[Eric Noulard]

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  f321a201bd59640639ad27cacef94501b5367391 (commit)
       via  301e67e3baae5ee3471f34216c7839a517f2d32c (commit)
       via  6d1e4efd00862f57dd9434ddbf4d5d7c8cb1f24a (commit)
       via  7e4a37800cf1901fd73940f06d9d19125fcd767b (commit)
      from  f7727eb0233ed8502a966adcb20a050e0275ef28 (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=f321a201bd59640639ad27cacef94501b5367391
commit f321a201bd59640639ad27cacef94501b5367391
Merge: f7727eb 301e67e
Author:     Eric Noulard <eric.noulard at gmail.com>
AuthorDate: Fri Sep 21 00:31:44 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Sep 21 00:31:44 2012 -0400

    Merge topic 'UpdateEmacsMode-bug0013548' into next
    
    301e67e cmake-mode.el: add local keybindings
    6d1e4ef cmake-mode.el: Use more readable regex and case-fold-search
    7e4a378 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=301e67e3baae5ee3471f34216c7839a517f2d32c
commit 301e67e3baae5ee3471f34216c7839a517f2d32c
Author:     Tom Schutter <t.schutter at comcast.net>
AuthorDate: Wed Sep 19 20:45:15 2012 -0600
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Fri Sep 21 06:28:24 2012 +0200

    cmake-mode.el: add local keybindings
    
    Signed-off-by: Eric NOULARD <eric.noulard at gmail.com>

diff --git a/Docs/cmake-mode.el b/Docs/cmake-mode.el
index 79d2319..6feed94 100644
--- a/Docs/cmake-mode.el
+++ b/Docs/cmake-mode.el
@@ -230,13 +230,26 @@ the indentation.  Otherwise it retains the same position on the line"
 ;;
 (defvar cmake-tab-width 2)
 
+;;
+;; Keymap.
+;;
+(defvar cmake-mode-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "\C-ch" 'cmake-help-command)
+    (define-key map "\C-cl" 'cmake-help-list-commands)
+    (define-key map "\C-cu" 'unscreamify-cmake-buffer)
+    map)
+  "Keymap used in cmake-mode buffers.")
+
 ;------------------------------------------------------------------------------
 
 ;;
 ;; CMake mode startup function.
 ;;
 (defun cmake-mode ()
-  "Major mode for editing CMake listfiles."
+  "Major mode for editing CMake listfiles.
+
+\\{cmake-mode-map}"
   (interactive)
   (kill-all-local-variables)
   (setq major-mode 'cmake-mode)
@@ -263,6 +276,9 @@ the indentation.  Otherwise it retains the same position on the line"
   (make-local-variable 'comment-start)
   (setq comment-start "#")
 
+  ; Setup keymap.
+  (use-local-map cmake-mode-map)
+
   ; Run user hooks.
   (run-hooks 'cmake-mode-hook))
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6d1e4efd00862f57dd9434ddbf4d5d7c8cb1f24a
commit 6d1e4efd00862f57dd9434ddbf4d5d7c8cb1f24a
Author:     Tom Schutter <t.schutter at comcast.net>
AuthorDate: Wed Sep 19 20:33:35 2012 -0600
Commit:     Eric NOULARD <eric.noulard at gmail.com>
CommitDate: Fri Sep 21 06:28:03 2012 +0200

    cmake-mode.el: Use more readable regex and case-fold-search
    
    This reimplement ab9824e.
    
    Signed-off-by: Eric NOULARD <eric.noulard at gmail.com>

diff --git a/Docs/cmake-mode.el b/Docs/cmake-mode.el
index 478bc7a..79d2319 100644
--- a/Docs/cmake-mode.el
+++ b/Docs/cmake-mode.el
@@ -68,9 +68,9 @@ set the path with these commands:
                                        "\\|" "[ \t\r\n]"
                                        "\\)*"))
 (defconst cmake-regex-block-open
-  "^\\([iI][fF]\\|[mM][aA][cC][rR][oO]\\|[fF][oO][rR][eE][aA][cC][hH]\\|[eE][lL][sS][eE]\\|[eE][lL][sS][eE][iI][fF]\\|[wW][hH][iI][lL][eE]\\|[fF][uU][nN][cC][tT][iI][oO][nN]\\)$")
+  "^\\(if\\|macro\\|foreach\\|else\\|elseif\\|while\\|function\\)$")
 (defconst cmake-regex-block-close
-  "^[ \t]*\\([eE][nN][dD][iI][fF]\\|[eE][nN][dD][fF][oO][rR][eE][aA][cC][hH]\\|[eE][nN][dD][mM][aA][cC][rR][oO]\\|[eE][lL][sS][eE]\\|[eE][lL][sS][eE][iI][fF]\\|[eE][nN][dD][wW][hH][iI][lL][eE]\\|[eE][nN][dD][fF][uU][nN][cC][tT][iI][oO][nN]\\)[ \t]*(")
+  "^[ \t]*\\(endif\\|endforeach\\|endmacro\\|else\\|elseif\\|endwhile\\|endfunction\\)[ \t]*(")
 
 ;------------------------------------------------------------------------------
 
@@ -126,6 +126,7 @@ set the path with these commands:
           (beginning-of-line)
 
           (let ((point-start (point))
+                (case-fold-search t)  ;; case-insensitive
                 token)
 
             ; Search back for the last indented line.

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

Summary of changes:
 Docs/cmake-mode.el        |   23 ++++++++++++++++++++---
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 21 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake