2 files changed, 6 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 69240aba4ef..e4438e0f497 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-01  Bozhidar Batsov  <bozhidar@batsov.com>
+
+        * progmodes/ruby-mode.el (ruby-mode-variables): Don't set syntax
+        table and abbrev table, `define-derived-mode' does that for us
+        anyway.
+
 2013-11-01  Glenn Morris  <rgm@gnu.org>
 
         * Makefile.in: Remove manual mh-e dependencies (writing .elc
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 1a49f705dcb..db78d33e61e 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -141,9 +141,6 @@ This should only be called after matching against `ruby-here-doc-beg-re'."
 (defconst ruby-symbol-re (concat "[" ruby-symbol-chars "]")
   "Regexp to match symbols.")
 
-(define-abbrev-table 'ruby-mode-abbrev-table ()
-  "Abbrev table in use in Ruby mode buffers.")
-
 (defvar ruby-use-smie t)
 
 (defvar ruby-mode-map
@@ -563,8 +560,6 @@ explicitly declared in magic comment."
 
 (defun ruby-mode-variables ()
   "Set up initial buffer-local variables for Ruby mode."
-  (set-syntax-table ruby-mode-syntax-table)
-  (setq local-abbrev-table ruby-mode-abbrev-table)
   (setq indent-tabs-mode ruby-indent-tabs-mode)
   (if ruby-use-smie
       (smie-setup ruby-smie-grammar #'ruby-smie-rules