diff options
-rw-r--r-- | lisp/ChangeLog | 5 | ||||
-rw-r--r-- | lisp/delsel.el | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 0734216555..2daf277166 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2014-06-17 Stefan Monnier <monnier@iro.umontreal.ca> + + * delsel.el (electric-newline-and-maybe-indent): Mark it as well + (bug#17737). + 2014-06-16 Dmitry <dgutov@yandex.ru> * progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't fontify diff --git a/lisp/delsel.el b/lisp/delsel.el index ab71e60644..1ada02705f 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el @@ -188,6 +188,7 @@ See `delete-selection-helper'." (put 'reindent-then-newline-and-indent 'delete-selection t) (put 'newline-and-indent 'delete-selection t) (put 'newline 'delete-selection t) +(put 'electric-newline-and-maybe-indent 'delete-selection t) (put 'open-line 'delete-selection 'kill) ;; This is very useful for canceling a selection in the minibuffer without |