diff options
| author | Dave Mayo <dave_mayo@harvard.edu> | 2014-08-05 20:37:07 -0400 |
|---|---|---|
| committer | Dave Mayo <pobocks@gmail.com> | 2014-08-10 15:58:08 -0400 |
| commit | 09c2f6381bb6313d0472cbc77724964e2b554c24 (patch) | |
| tree | bf13132152c4abfc9543c117c7cd4a4b255fa93f | |
| parent | 4ab83795aa00b0f8ff6ad97ca0d63e91ebe09628 (diff) | |
| download | emmet-mode-09c2f6381bb6313d0472cbc77724964e2b554c24.tar.lz emmet-mode-09c2f6381bb6313d0472cbc77724964e2b554c24.tar.xz emmet-mode-09c2f6381bb6313d0472cbc77724964e2b554c24.zip | |
Replace mark-active with (use-region-p)
| -rw-r--r-- | emmet-mode.el | 6 | ||||
| -rw-r--r-- | 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) |