* lisp/progmodes/ruby-mode.el (ruby-mode-variables): Don't meddle with

require-final-newline since prog-mode already took care of it.

Fixes: debbugs:17947

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e9c492dc013e9d3128a3e73611f423a13c2a87aa..b34f9cf1fefdb7dd1cc3bdd446c6e9bfdc8f99e8 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-05  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * progmodes/ruby-mode.el (ruby-mode-variables): Don't meddle with
+       require-final-newline since prog-mode already took care of it (bug#17947).
+
 2014-07-04  Stephen Berman  <stephen.berman@gmx.net>
 
        * calendar/todo-mode.el: Fix two bugs.  Shorten Commentary and

diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 3c20279600eb9acbb1e364a2fd2bd8239bd3ff2f..2f23e338f81aa004f98a16651c828605d3a31b5a 100644 (file)
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -749,7 +749,6 @@ It is used when `ruby-encoding-magic-comment-style' is set to `custom'."
                   :forward-token  #'ruby-smie--forward-token
                   :backward-token #'ruby-smie--backward-token)
     (setq-local indent-line-function 'ruby-indent-line))
-  (setq-local require-final-newline t)
   (setq-local comment-start "# ")
   (setq-local comment-end "")
   (setq-local comment-column ruby-comment-column)