branch: elpa/evil-exchange
commit 51c830b65d06d3ce947a0390386933dc0efe97a4
Author: Dewdrops <[email protected]>
Commit: Dewdrops <[email protected]>
better error message
---
evil-exchange.el | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/evil-exchange.el b/evil-exchange.el
index 431bacf570..e002514e6b 100644
--- a/evil-exchange.el
+++ b/evil-exchange.el
@@ -4,7 +4,7 @@
;; Author: Dewdrops <[email protected]>
;; URL: http://github.com/Dewdrops/evil-exchange
-;; Version: 0.21
+;; Version: 0.22
;; Keywords: evil, plugin
;; Package-Requires: ((evil "1.0.7") (cl-lib "0.3"))
@@ -109,7 +109,7 @@
#'delete-extract-rectangle
#'insert-rectangle))
;; signal error if regions incompatible
((or (eq orig-type 'block) (eq type 'block))
- (error "Can't exchange block region with non-block region."))
+ (user-error "Can't exchange block region with non-block region"))
;; exchange normal region
(t
(evil-exchange--do-swap beg-marker end-marker
@@ -134,9 +134,11 @@
(defun evil-exchange-cancel ()
"Cancel current pending exchange."
(interactive)
- (setq evil-exchange--position nil)
- (evil-exchange--remove-overlays)
- (message "Exchange cancelled"))
+ (if (null evil-exchange--position)
+ (message "No pending exchange")
+ (setq evil-exchange--position nil)
+ (evil-exchange--remove-overlays)
+ (message "Exchange cancelled")))
;;;###autoload
(defun evil-exchange-install ()
@@ -146,5 +148,6 @@
(define-key evil-normal-state-map evil-exchange-cancel-key
'evil-exchange-cancel)
(define-key evil-visual-state-map evil-exchange-cancel-key
'evil-exchange-cancel))
+
(provide 'evil-exchange)
;;; evil-exchange.el ends here
