[elpa] 53/77: Destroy after-string before goto-char in easy-kill-abort

[Leo Liu]

leoliu pushed a commit to branch master
in repository elpa.

commit ed3b98f94630dfb862584da607455c93e0cf59a0
Author: Leo Liu <address@hidden>
Date:   Wed Oct 16 08:28:49 2013 +0800

    Destroy after-string before goto-char in easy-kill-abort
    
    Revert bogus commit 4e2d3735
    "Teach easy-kill-abort to deactivate mark immediately".
---
 easy-kill.el |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/easy-kill.el b/easy-kill.el
index 2cb7b3a..ce1e136 100644
--- a/easy-kill.el
+++ b/easy-kill.el
@@ -259,8 +259,11 @@ candidate property instead."
 (defun easy-kill-abort ()
   (interactive)
   (when easy-kill-mark
+    ;; The after-string may interfere with `goto-char'.
+    (overlay-put (overlay-get easy-kill-candidate 'origin-indicator)
+                 'after-string nil)
     (goto-char (overlay-get easy-kill-candidate 'origin))
-    (deactivate-mark))
+    (setq deactivate-mark t))
   (ding))
 
 (put 'easy-kill-region 'easy-kill-exit t)