auto upstream

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 @@
+2012-12-21  Kelly Dean  <kellydeanch@yahoo.com>  (tiny change)
+
+        * simple.el (kill-region): Deactivate mark even for empty regions
+        (Bug#13169).
+
 2012-12-21  Chong Yidong  <cyd@gnu.org>
 
         * 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."
             (kill-new string nil yank-handler)))
         (when (or string (eq last-command 'kill-region))
           (setq this-command 'kill-region))
+        (setq deactivate-mark t)
         nil)
     ((buffer-read-only text-read-only)
      ;; The code above failed because the buffer, or some of the characters