From 09c2f6381bb6313d0472cbc77724964e2b554c24 Mon Sep 17 00:00:00 2001
From: Dave Mayo <dave_mayo@harvard.edu>
Date: Tue, 5 Aug 2014 20:37:07 -0400
Subject: Replace mark-active with (use-region-p)

---
 emmet-mode.el   | 6 +++---
 src/mode-def.el | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/emmet-mode.el b/emmet-mode.el
index 5ff158a..462adf2 100644
--- a/emmet-mode.el
+++ b/emmet-mode.el
@@ -3535,13 +3535,13 @@ For more information see `emmet-mode'."
                     (beginning-of-line)
                     (skip-chars-forward " \t")
                     (point))
-                (when mark-active (region-beginning))))
+                (when (use-region-p) (region-beginning))))
          (end (if preview
                   (progn
                     (end-of-line)
                     (skip-chars-backward " \t")
                     (point))
-                (when mark-active (region-end)))))
+                (when (use-region-p) (region-end)))))
     (if (and preview beg)
         (progn
           (goto-char here)
@@ -3759,7 +3759,7 @@ cursor position will be moved to after the first quote."
   "Expand emmet between BEG and END interactively.
 This will show a preview of the expanded emmet code and you can
 accept it or skip it."
-  (interactive (if mark-active
+  (interactive (if (use-region-p)
                    (list (region-beginning) (region-end))
                  (list nil nil)))
   (emmet-preview-abort)
diff --git a/src/mode-def.el b/src/mode-def.el
index e84bf96..e8060a6 100644
--- a/src/mode-def.el
+++ b/src/mode-def.el
@@ -70,13 +70,13 @@ For more information see `emmet-mode'."
                     (beginning-of-line)
                     (skip-chars-forward " \t")
                     (point))
-                (when mark-active (region-beginning))))
+                (when (use-region-p) (region-beginning))))
          (end (if preview
                   (progn
                     (end-of-line)
                     (skip-chars-backward " \t")
                     (point))
-                (when mark-active (region-end)))))
+                (when (use-region-p) (region-end)))))
     (if (and preview beg)
         (progn
           (goto-char here)
@@ -294,7 +294,7 @@ cursor position will be moved to after the first quote."
   "Expand emmet between BEG and END interactively.
 This will show a preview of the expanded emmet code and you can
 accept it or skip it."
-  (interactive (if mark-active
+  (interactive (if (use-region-p)
                    (list (region-beginning) (region-end))
                  (list nil nil)))
   (emmet-preview-abort)
-- 
cgit v1.2.3