Skip to content

Use user-region-p instead of raw mark-active #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jaor wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use user-region-p instead of raw mark-active #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions mingus.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
;; ....................but actually named after a man so named
;;

;; Copyright (C) 2006-2011, 2015, 2016 Niels Giesen <com dot gmail at
;; Copyright (C) 2006-2011, 2015, 2016, 2019 Niels Giesen <com dot gmail at
;; niels dot giesen, in reversed order>

;; Author: Niels Giesen <pft on #emacs>
Expand Down Expand Up @@ -1718,7 +1718,7 @@ E.g.: \"Artist 3 my beautiful song\" is logically less than \"Artist 11 blue sea
(defun mingus-mark-active ()
(if (featurep 'xemacs)
(mark)
mark-active))
(use-region-p)))

(defun mingus-min:sec->secs (min:secs)
"Convert MIN:SECS (a string) to seconds (an integer)."
Expand Down Expand Up @@ -3354,11 +3354,12 @@ Actually it tries to retrieve any stream from a given url.
(mingus-browse-top-level)))))

(defun mingus-get-items ()
(let ((items (unless mark-active
(list (mingus-get-details))))
(beg (if mark-active (min (mark) (point))))
(end (if mark-active (max (mark) (point)))))
(when mark-active
(let* ((markp (mingus-mark-active))
(items (unless markp
(list (mingus-get-details))))
(beg (if markp (min (mark) (point))))
(end (if markp (max (mark) (point)))))
(when markp
(save-excursion
(goto-char end)
(while
Expand Down Expand Up @@ -4226,8 +4227,8 @@ It may also mean handling file:/// links."
"Get everything under the region, sloppily.
Region is between (beginning of line of) BEG and (beginning of line of) END."
(interactive "r")
(let ((beg (if mark-active (_mingus-bol-at beg) (point-at-bol)))
(end (if mark-active (_mingus-bol-at end) (point-at-eol)))
(let ((beg (if (mingus-mark-active) (_mingus-bol-at beg) (point-at-bol)))
(end (if (mingus-mark-active) (_mingus-bol-at end) (point-at-eol)))
results)
(save-excursion
(goto-char beg)
Expand Down