branch: elpa/subed
commit b74051156f19c828c6e6382180a86b419926033d
Author: Random User <rnd...@posteo.de>
Commit: Random User <rnd...@posteo.de>
Use mark-active instead of use-region-p
We want to move subtitles in the active region regardless of
transient-mark-mode, but the function use-region-p always returns nil if
transient-mark-mode is disabled.
The variable mark-active seems to be what we want here.
---
subed/subed-common.el | 20 +++++++++-----------
tests/test-subed-common.el | 26 +++++++++++++-------------
2 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/subed/subed-common.el b/subed/subed-common.el
index 35461dd..8677a2d 100644
--- a/subed/subed-common.el
+++ b/subed/subed-common.el
@@ -410,8 +410,8 @@ Example usage:
(interactive "P")
(let ((deactivate-mark nil)
(msecs (subed-get-milliseconds-adjust arg))
- (beg (when (use-region-p) (region-beginning)))
- (end (when (use-region-p) (region-end))))
+ (beg (when mark-active (region-beginning)))
+ (end (when mark-active (region-end))))
(subed-move-subtitles msecs beg end)))
(defun subed-move-subtitle-backward (&optional arg)
@@ -421,8 +421,8 @@ See `subed-move-subtitle-forward' about ARG."
(interactive "P")
(let ((deactivate-mark nil)
(msecs (* -1 (subed-get-milliseconds-adjust arg)))
- (beg (when (use-region-p) (region-beginning)))
- (end (when (use-region-p) (region-end))))
+ (beg (when mark-active (region-beginning)))
+ (end (when mark-active (region-end))))
(subed-move-subtitles msecs beg end)))
@@ -438,9 +438,8 @@ between point and the end of the buffer.
See `subed-move-subtitle-forward' about ARG."
(interactive "P")
(let ((deactivate-mark nil)
- (msecs (subed-get-milliseconds-adjust arg))
- (beg (if (use-region-p) (region-beginning) (point))))
- (subed-move-subtitles msecs beg)))
+ (msecs (subed-get-milliseconds-adjust arg)))
+ (subed-move-subtitles msecs (point))))
(defun subed-shift-subtitle-backward (&optional arg)
"Shift subtitle `subed-milliseconds-adjust' backward.
@@ -451,9 +450,8 @@ between point and the end of the buffer.
See `subed-move-subtitle-forward' about ARG."
(interactive "P")
(let ((deactivate-mark nil)
- (msecs (* -1 (subed-get-milliseconds-adjust arg)))
- (beg (if (use-region-p) (region-beginning) (point))))
- (subed-move-subtitles msecs beg)))
+ (msecs (* -1 (subed-get-milliseconds-adjust arg))))
+ (subed-move-subtitles msecs (point))))
;;; Inserting
@@ -699,7 +697,7 @@ If QUIET is non-nil, do not display a message in the
minibuffer."
(defun subed--sync-point-to-player (msecs)
"Move point to subtitle at MSECS."
- (when (and (not (use-region-p))
+ (when (and (not (use-region-p)) ;; Don't sync with active-mark in
transient-mark-mode
(subed-jump-to-subtitle-text-at-msecs msecs))
(subed-debug "Synchronized point to playback position: %s -> #%s"
(subed-srt--msecs-to-timestamp msecs) (subed-subtitle-id))
diff --git a/tests/test-subed-common.el b/tests/test-subed-common.el
index 442348a..bea81d4 100644
--- a/tests/test-subed-common.el
+++ b/tests/test-subed-common.el
@@ -517,7 +517,7 @@ Baz.
"3\n"
"00:00:05,000 --> 00:00:06,000\n"
"Baz.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value
(subed-jump-to-subtitle-text 2))
(spy-on 'region-end :and-return-value
(subed-jump-to-subtitle-time-start 3))
(let ((orig-point (subed-jump-to-subtitle-text 2)))
@@ -548,7 +548,7 @@ Baz.
"3\n"
"00:00:05,000 --> 00:00:06,000\n"
"Baz.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value
(subed-jump-to-subtitle-text 1))
(spy-on 'region-end :and-return-value
(subed-jump-to-subtitle-time-stop 2))
(let ((orig-point (subed-jump-to-subtitle-time-stop 3)))
@@ -580,7 +580,7 @@ Baz.
"3\n"
"00:00:12,000 --> 00:00:13,000\n"
"Baz.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value
(subed-jump-to-subtitle-id 1))
(spy-on 'region-end :and-return-value (subed-jump-to-subtitle-text
2))
(let ((orig-point (subed-jump-to-subtitle-time-start 1)))
@@ -603,7 +603,7 @@ Baz.
"3\n"
"00:00:10,000 --> 00:00:11,000\n"
"Baz.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value
(subed-jump-to-subtitle-id 2))
(spy-on 'region-end :and-return-value (subed-jump-to-subtitle-text
3))
(let ((orig-point (subed-jump-to-subtitle-time-start 2)))
@@ -629,7 +629,7 @@ Baz.
"3\n"
"00:00:11,000 --> 00:00:12,000\n"
"Baz.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value (subed-jump-to-subtitle-id
1))
(spy-on 'region-end :and-return-value (subed-jump-to-subtitle-text 2))
(let ((orig-point (subed-jump-to-subtitle-text 1)))
@@ -652,7 +652,7 @@ Baz.
"3\n"
"00:00:11,000 --> 00:00:12,000\n"
"Baz.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value (subed-jump-to-subtitle-id
2))
(spy-on 'region-end :and-return-value (subed-jump-to-subtitle-text 3))
(let ((orig-point (subed-jump-to-subtitle-id 3)))
@@ -677,7 +677,7 @@ Baz.
"3\n"
"00:00:05,000 --> 00:00:6,000\n"
"Baz.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value (subed-jump-to-subtitle-id
1))
(spy-on 'region-end :and-return-value (subed-jump-to-subtitle-text 2))
(let ((orig-point (subed-jump-to-subtitle-time-start 3)))
@@ -700,7 +700,7 @@ Baz.
"3\n"
"00:00:05,000 --> 00:00:05,000\n"
"Baz.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value (subed-jump-to-subtitle-id
2))
(spy-on 'region-end :and-return-value (subed-jump-to-subtitle-text 3))
(let ((orig-point (subed-jump-to-subtitle-time-stop 1)))
@@ -725,7 +725,7 @@ Baz.
"3\n"
"00:00:05,000 --> 00:00:6,000\n"
"Baz.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value (subed-jump-to-subtitle-id
1))
(spy-on 'region-end :and-return-value (subed-jump-to-subtitle-text 2))
(let ((orig-point (subed-jump-to-subtitle-text 2)))
@@ -748,7 +748,7 @@ Baz.
"3\n"
"00:00:04,500 --> 00:00:04,490\n"
"Baz.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value (subed-jump-to-subtitle-id
2))
(spy-on 'region-end :and-return-value (subed-jump-to-subtitle-text 3))
(let ((orig-point (subed-jump-to-subtitle-text 1)))
@@ -772,7 +772,7 @@ Baz.
"3\n"
"00:00:05,000 --> 00:00:06,000\n"
"Bar.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value (subed-jump-to-subtitle-text
1))
(spy-on 'region-end :and-return-value (subed-jump-to-subtitle-time-start
2))
(let ((orig-point (subed-jump-to-subtitle-time-stop 1)))
@@ -803,7 +803,7 @@ Baz.
"3\n"
"00:00:05,500 --> 00:00:05,000\n"
"Bar.\n"))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value (subed-jump-to-subtitle-text
2))
(spy-on 'region-end :and-return-value (subed-jump-to-subtitle-time-start
3))
(let ((orig-point (subed-jump-to-subtitle-text 1)))
@@ -871,7 +871,7 @@ Baz.
(insert mock-srt-data)
(let ((beg 15)
(end (point-max)))
- (spy-on 'use-region-p :and-return-value t)
+ (setq mark-active t)
(spy-on 'region-beginning :and-return-value beg)
(spy-on 'region-end :and-return-value end)
(spy-on 'subed-replay-adjusted-subtitle-p :and-return-value t)
