diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/simple.el | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 90086b27a5e..e89602c8e45 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-21 Kelly Dean <kellydeanch@yahoo.com> (tiny change) | ||
| 2 | |||
| 3 | * simple.el (kill-region): Deactivate mark even for empty regions | ||
| 4 | (Bug#13169). | ||
| 5 | |||
| 1 | 2012-12-21 Chong Yidong <cyd@gnu.org> | 6 | 2012-12-21 Chong Yidong <cyd@gnu.org> |
| 2 | 7 | ||
| 3 | * help-fns.el (describe-variable): Make sure we get the right | 8 | * help-fns.el (describe-variable): Make sure we get the right |
diff --git a/lisp/simple.el b/lisp/simple.el index 78b76579584..8c7e88d04bc 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -3370,6 +3370,7 @@ to make one entry in the kill ring." | |||
| 3370 | (kill-new string nil yank-handler))) | 3370 | (kill-new string nil yank-handler))) |
| 3371 | (when (or string (eq last-command 'kill-region)) | 3371 | (when (or string (eq last-command 'kill-region)) |
| 3372 | (setq this-command 'kill-region)) | 3372 | (setq this-command 'kill-region)) |
| 3373 | (setq deactivate-mark t) | ||
| 3373 | nil) | 3374 | nil) |
| 3374 | ((buffer-read-only text-read-only) | 3375 | ((buffer-read-only text-read-only) |
| 3375 | ;; The code above failed because the buffer, or some of the characters | 3376 | ;; The code above failed because the buffer, or some of the characters |