aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBozhidar Batsov2013-11-02 03:55:15 +0400
committerDmitry Gutov2013-11-02 03:55:15 +0400
commit6f9260e8f83078698c8a50756ecdfd13e61a80ec (patch)
treeb8e69ead400c37dc455a1ecc376d21584d08472d
parent6014de8418e260b9bdbcc2faa6dac7e0b6324b19 (diff)
downloademacs-6f9260e8f83078698c8a50756ecdfd13e61a80ec.tar.gz
emacs-6f9260e8f83078698c8a50756ecdfd13e61a80ec.zip
* lisp/progmodes/ruby-mode.el (ruby-mode-variables): Don't set syntax
table and abbrev table, `define-derived-mode' does that for us anyway.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/ruby-mode.el5
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 @@
12013-11-01 Bozhidar Batsov <bozhidar@batsov.com>
2
3 * progmodes/ruby-mode.el (ruby-mode-variables): Don't set syntax
4 table and abbrev table, `define-derived-mode' does that for us
5 anyway.
6
12013-11-01 Glenn Morris <rgm@gnu.org> 72013-11-01 Glenn Morris <rgm@gnu.org>
2 8
3 * Makefile.in: Remove manual mh-e dependencies (writing .elc 9 * 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'."
141(defconst ruby-symbol-re (concat "[" ruby-symbol-chars "]") 141(defconst ruby-symbol-re (concat "[" ruby-symbol-chars "]")
142 "Regexp to match symbols.") 142 "Regexp to match symbols.")
143 143
144(define-abbrev-table 'ruby-mode-abbrev-table ()
145 "Abbrev table in use in Ruby mode buffers.")
146
147(defvar ruby-use-smie t) 144(defvar ruby-use-smie t)
148 145
149(defvar ruby-mode-map 146(defvar ruby-mode-map
@@ -563,8 +560,6 @@ explicitly declared in magic comment."
563 560
564(defun ruby-mode-variables () 561(defun ruby-mode-variables ()
565 "Set up initial buffer-local variables for Ruby mode." 562 "Set up initial buffer-local variables for Ruby mode."
566 (set-syntax-table ruby-mode-syntax-table)
567 (setq local-abbrev-table ruby-mode-abbrev-table)
568 (setq indent-tabs-mode ruby-indent-tabs-mode) 563 (setq indent-tabs-mode ruby-indent-tabs-mode)
569 (if ruby-use-smie 564 (if ruby-use-smie
570 (smie-setup ruby-smie-grammar #'ruby-smie-rules 565 (smie-setup ruby-smie-grammar #'ruby-smie-rules