summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--misc/ruby-mode.el1
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b8e7a5f436a..f7c1ff547c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-Sun Mar 27 15:45:47 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Mar 27 16:55:34 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * misc/ruby-mode.el (ruby-mode-map): remove unnecessary
+ binding. fixes
+ http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468952
* misc/ruby-mode.el: suppress warnings at byte compile. fixes
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502926
diff --git a/misc/ruby-mode.el b/misc/ruby-mode.el
index 81792239be0..a65278eff7d 100644
--- a/misc/ruby-mode.el
+++ b/misc/ruby-mode.el
@@ -172,7 +172,6 @@
(define-key ruby-mode-map "\t" 'ruby-indent-command)
(define-key ruby-mode-map "\C-c\C-e" 'ruby-insert-end)
(define-key ruby-mode-map "\C-j" 'ruby-reindent-then-newline-and-indent)
- (define-key ruby-mode-map "\C-m" 'newline)
(define-key ruby-mode-map "\C-c\C-u" 'uncomment-region))
(defvar ruby-mode-syntax-table nil