emacs-emojify

commit cc72847da72a4563e850a6d579e0e7514725cbdd
parent 5533bb9187d3c89e5bc9e873a9ccab34db812e45
Author: Iqbal Ansari <iqbalansari02@yahoo.com>
Date:   Fri, 27 Nov 2015 21:50:47 +0530

Improve checks for active region

Diffstat:
M
emojify.el
 | 
6
++++--

1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/emojify.el b/emojify.el
@@ -522,7 +522,8 @@ which is not what we want when falling back in `emojify-delete-emoji'"
           key-binding))))
 
 (defun emojify--inside-rectangle-selection-p (beg end)
-  (when (bound-and-true-p rectangle-mark-mode)
+  (when (and emojify-region-beg
+             (bound-and-true-p rectangle-mark-mode))
     (let ((rect-beg (save-excursion
                       (goto-char emojify-region-beg)
                       (cons (current-column) (line-number-at-pos))))
@@ -536,7 +537,8 @@ which is not what we want when falling back in `emojify-delete-emoji'"
            (<= (cdr rect-beg) (cdr point-pos) (cdr rect-end))))))
 
 (defun emojify--inside-non-rectangle-selection-p (beg end)
-  (when (and (region-active-p)
+  (when (and emojify-region-beg
+             (region-active-p)
              (not (bound-and-true-p rectangle-mark-mode)))
     (<= emojify-region-beg beg end emojify-region-end)))