diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-06-27 14:18:49 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-06-27 14:18:49 -0400 |
| commit | 2286174ec6dd3d19ebb6ae58e6611eb5d5967499 (patch) | |
| tree | fe1c8edcd2d2b76450193ca5d8b7051f52a766ad /lisp | |
| parent | 3468f4350a8fc68f0397c784ea140f91295db5c7 (diff) | |
| download | emacs-2286174ec6dd3d19ebb6ae58e6611eb5d5967499.tar.gz | |
* progmodes/ruby-mode.el (ruby-mode-map): Don't bind TAB.
(ruby-mode): Bind indent-line-function (Bug#5119).
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7c12b3f5ec2..d88b7dfab2c 100644 --- 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 59d85e60eef..a75c5b01bb8 100644 --- 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) |