* progmodes/ruby-mode.el (ruby-mode-map): Don't bind TAB.

(ruby-mode): Bind indent-line-function (Bug#5119).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7c12b3f5ec2c388fb15e8763040a225119678475..d88b7dfab2c5a94a44e5d44559cb50013ed908ca 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-16  Lennart Borgman  <lennart.borgman@gmail.com>
+
+       * progmodes/ruby-mode.el (ruby-mode-map): Don't bind TAB.
+       (ruby-mode): Bind indent-line-function (Bug#5119).
+
 2010-06-27  Chong Yidong  <cyd@stupidchicken.com>
 
        * startup.el (command-line): Recognize "0" X resource value.

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 59d85e60eefd84284420373bd644a2903693aa79..a75c5b01bb8bdaa34a3bf1db0c30ffa299f21d56 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -166,7 +166,6 @@ This should only be called after matching against `ruby-here-doc-end-re'."
     (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 "TAB")   'ruby-indent-line)
     (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-m")   'newline)
@@ -1390,6 +1389,8 @@ The variable `ruby-indent-level' controls the amount of indentation.
   (setq major-mode 'ruby-mode)
   (ruby-mode-variables)
 
+  (set (make-local-variable 'indent-line-function)
+       'ruby-indent-line)
   (set (make-local-variable 'imenu-create-index-function)
        'ruby-imenu-create-index)
   (set (make-local-variable 'add-log-current-defun-function)