[Emacs-diffs] /srv/bzr/emacs/trunk r109870: * ruby-mode.el: Clean up keybindings.

[Dmitry Gutov]

------------------------------------------------------------
revno: 109870
committer: Dmitry Gutov <address@hidden>
branch nick: trunk
timestamp: Tue 2012-09-04 08:42:47 +0400
message:
  * ruby-mode.el: Clean up keybindings.
  (ruby-mode-map): Don't bind ruby-electric-brace,
  ruby-beginning-of-defun, ruby-end-of-defun, ruby-mark-defun,
  backward-kill-word, reindent-then-newline-and-indent.
  (ruby-mark-defun): Remove.
  (ruby-electric-brace): Remove.  Obsoleted by electric-indent-chars.
  (ruby-mode): Set local beginning-of-defun-function and
  end-of-defun-function values.
modified:
  lisp/progmodes/ruby-mode.el

=== modified file 'lisp/progmodes/ruby-mode.el'
--- a/lisp/progmodes/ruby-mode.el       2012-08-14 12:38:11 +0000
+++ b/lisp/progmodes/ruby-mode.el       2012-09-04 04:42:47 +0000
@@ -138,18 +138,11 @@
 
 (defvar ruby-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map "{" 'ruby-electric-brace)
-    (define-key map "}" 'ruby-electric-brace)
-    (define-key map (kbd "M-C-a") 'ruby-beginning-of-defun)
-    (define-key map (kbd "M-C-e") 'ruby-end-of-defun)
     (define-key map (kbd "M-C-b") 'ruby-backward-sexp)
     (define-key map (kbd "M-C-f") 'ruby-forward-sexp)
     (define-key map (kbd "M-C-p") 'ruby-beginning-of-block)
     (define-key map (kbd "M-C-n") 'ruby-end-of-block)
-    (define-key map (kbd "M-C-h") 'ruby-mark-defun)
     (define-key map (kbd "M-C-q") 'ruby-indent-exp)
-    (define-key map (kbd "C-M-h") 'backward-kill-word)
-    (define-key map (kbd "C-j")   'reindent-then-newline-and-indent)
     (define-key map (kbd "C-c {") 'ruby-toggle-block)
     map)
   "Keymap used in Ruby mode.")
@@ -840,12 +833,6 @@
           (+ indent ruby-indent-level)
         indent))))
 
-(defun ruby-electric-brace (arg)
-  "Insert a brace and re-indent the current line."
-  (interactive "P")
-  (self-insert-command (prefix-numeric-value arg))
-  (ruby-indent-line t))
-
 ;; TODO: Why isn't one ruby-*-of-defun written in terms of the other?
 (defun ruby-beginning-of-defun (&optional arg)
   "Move backward to the beginning of the current top-level defun.
@@ -1024,15 +1011,6 @@
         ((error)))
       i)))
 
-(defun ruby-mark-defun ()
-  "Put mark at end of this Ruby function, point at beginning."
-  (interactive)
-  (push-mark (point))
-  (ruby-end-of-defun)
-  (push-mark (point) nil t)
-  (ruby-beginning-of-defun)
-  (re-search-backward "^\n" (- (point) 1) t))
-
 (defun ruby-indent-exp (&optional ignored)
   "Indent each line in the balanced expression following the point."
   (interactive "*P")
@@ -1586,6 +1564,10 @@
        'ruby-imenu-create-index)
   (set (make-local-variable 'add-log-current-defun-function)
        'ruby-add-log-current-method)
+  (set (make-local-variable 'beginning-of-defun-function)
+       'ruby-beginning-of-defun)
+  (set (make-local-variable 'end-of-defun-function)
+       'ruby-end-of-defun)
 
   (add-hook
    (cond ((boundp 'before-save-hook) 'before-save-hook)