diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-07-05 14:37:45 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2014-07-05 14:37:45 -0400 |
| commit | d66146bf1851fd65a903b1b67b3deee3aba2082e (patch) | |
| tree | 55ff4eb564f3804c7b3e1f863611db20b9d7b070 /lisp | |
| parent | bff2d1ffc49d635a7545fd31786ac9e6966016ba (diff) | |
| download | emacs-d66146bf1851fd65a903b1b67b3deee3aba2082e.tar.gz | |
* 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
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/progmodes/ruby-mode.el | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e9c492dc013..b34f9cf1fef 100644 --- 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 3c20279600e..2f23e338f81 100644 --- 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) |