diff options
| author | Stefan Monnier | 2014-06-17 09:40:03 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2014-06-17 09:40:03 -0400 |
| commit | c18add241de89fc7c92200ffcd6b0f3ac083ba51 (patch) | |
| tree | 69c2ab17470463c3e4e5da9d52b1df2b4a5ab357 | |
| parent | c89f1288cb02c529afaa184069b94ec820f640e9 (diff) | |
| download | emacs-c18add241de89fc7c92200ffcd6b0f3ac083ba51.tar.gz emacs-c18add241de89fc7c92200ffcd6b0f3ac083ba51.zip | |
* lisp/delsel.el (electric-newline-and-maybe-indent): Mark it as well.
Fixes: debbugs:17737
| -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 0734216555b..2daf277166f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-06-17 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * delsel.el (electric-newline-and-maybe-indent): Mark it as well | ||
| 4 | (bug#17737). | ||
| 5 | |||
| 1 | 2014-06-16 Dmitry <dgutov@yandex.ru> | 6 | 2014-06-16 Dmitry <dgutov@yandex.ru> |
| 2 | 7 | ||
| 3 | * progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't fontify | 8 | * progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't fontify |
diff --git a/lisp/delsel.el b/lisp/delsel.el index ab71e606444..1ada02705fe 100644 --- a/lisp/delsel.el +++ b/lisp/delsel.el | |||
| @@ -188,6 +188,7 @@ See `delete-selection-helper'." | |||
| 188 | (put 'reindent-then-newline-and-indent 'delete-selection t) | 188 | (put 'reindent-then-newline-and-indent 'delete-selection t) |
| 189 | (put 'newline-and-indent 'delete-selection t) | 189 | (put 'newline-and-indent 'delete-selection t) |
| 190 | (put 'newline 'delete-selection t) | 190 | (put 'newline 'delete-selection t) |
| 191 | (put 'electric-newline-and-maybe-indent 'delete-selection t) | ||
| 191 | (put 'open-line 'delete-selection 'kill) | 192 | (put 'open-line 'delete-selection 'kill) |
| 192 | 193 | ||
| 193 | ;; This is very useful for canceling a selection in the minibuffer without | 194 | ;; This is very useful for canceling a selection in the minibuffer without |