[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5259-g9ea0c4f

[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  9ea0c4f3d6f1529ba7eaf99bc915beeea1b0a1fd (commit)
       via  0f21261868b3b02ccc65314c957f3102f9edc4ef (commit)
      from  af353f7ef2eb531d09632bd6603f2fbd895c114b (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=9ea0c4f3d6f1529ba7eaf99bc915beeea1b0a1fd
commit 9ea0c4f3d6f1529ba7eaf99bc915beeea1b0a1fd
Merge: af353f7 0f21261
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 18 09:37:22 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 18 09:37:22 2013 -0500

    Merge topic 'emacs-mode-no-reserved-bindings' into next
    
    0f21261 cmake-mode.el: drop reserved keybindings (#14576)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0f21261868b3b02ccc65314c957f3102f9edc4ef
commit 0f21261868b3b02ccc65314c957f3102f9edc4ef
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 18 09:32:29 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 18 09:36:28 2013 -0500

    cmake-mode.el: drop reserved keybindings (#14576)
    
    The keybindings added by commit 301e67e3 (cmake-mode.el: add local
    keybindings, 2012-09-20) overlap the reserved C-c space:
    
     http://www.gnu.org/software/emacs/manual/html_node/elisp/Key-Binding-Conventions.html
    
    Revert the commit to drop them.
    
    Reported-by: Paul Smith <paul at mad-scientist.net>
    Reviewed-by: Eric NOULARD <eric.noulard at gmail.com>

diff --git a/Auxiliary/cmake-mode.el b/Auxiliary/cmake-mode.el
index 6feed94..79d2319 100644
--- a/Auxiliary/cmake-mode.el
+++ b/Auxiliary/cmake-mode.el
@@ -230,26 +230,13 @@ 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.
-
-\\{cmake-mode-map}"
+  "Major mode for editing CMake listfiles."
   (interactive)
   (kill-all-local-variables)
   (setq major-mode 'cmake-mode)
@@ -276,9 +263,6 @@ 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))
 

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

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


hooks/post-receive
-- 
CMake