[elpa] 48/77: Make command easy-kill-append work for easy-mark

[Leo Liu]

leoliu pushed a commit to branch master
in repository elpa.

commit 0b658c85f25e312e39cfb418d821326159b86afc
Author: Leo Liu <address@hidden>
Date:   Mon Oct 14 11:57:40 2013 +0800

    Make command easy-kill-append work for easy-mark
---
 README.rst   |    3 +++
 easy-kill.el |    7 ++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 4306c63..3ab89b8 100644
--- a/README.rst
+++ b/README.rst
@@ -38,6 +38,9 @@ The following `screenshot <http://i.imgur.com/8TNgPly.png>`_ 
shows
 To Use
 ~~~~~~
 
+``easy-kill`` is available on `MELPA
+<http://melpa.milkbox.net/#/easy-kill>`_.
+
 ::
 
    (require 'easy-kill)
diff --git a/easy-kill.el b/easy-kill.el
index 778c95a..d2338e3 100644
--- a/easy-kill.el
+++ b/easy-kill.el
@@ -166,7 +166,7 @@ candidate property instead."
            (funcall interprogram-cut-function (easy-kill-candidate))))))
 
 (defun easy-kill-save-candidate ()
-  (unless (or easy-kill-mark (string= (easy-kill-candidate) ""))
+  (unless (string= (easy-kill-candidate) "")
     ;; Do not modify the clipboard here because this may be called in
     ;; `pre-command-hook' and will confuse `yank' if it is the next
     ;; command. Also `easy-kill-adjust-candidate' already did the
@@ -305,8 +305,9 @@ candidate property instead."
                   (eq this-command (lookup-key map 
(this-command-keys-vector))))
              (ignore
               (easy-kill-destroy-candidate)
-              (unless (and (symbolp this-command)
-                           (get this-command 'easy-kill-exit))
+              (unless (or easy-kill-mark
+                          (and (symbolp this-command)
+                               (get this-command 'easy-kill-exit)))
                 (easy-kill-save-candidate)))))))))
 
 ;;;###autoload