[nongnu] elpa/subed 20c70e8 160/389: Make more functions public

[ELPA Syncer]

branch: elpa/subed
commit 20c70e8e03bb8190cd27a5a248315af098777206
Author: Random User <rndusr@posteo.de>
Commit: Random User <rndusr@posteo.de>

    Make more functions public
---
 subed/subed-config.el   |  13 +++--
 subed/subed-srt.el      |   4 +-
 subed/subed.el          |  68 +++++++++++------------
 tests/test-subed-srt.el |   4 +-
 tests/test-subed.el     | 144 ++++++++++++++++++++++++------------------------
 5 files changed, 117 insertions(+), 116 deletions(-)

diff --git a/subed/subed-config.el b/subed/subed-config.el
index 792cabd..32fc14c 100644
--- a/subed/subed-config.el
+++ b/subed/subed-config.el
@@ -123,10 +123,11 @@ variable persistent for the duration of the sessio.  Use
   :type 'float
   :group 'subed)
 
-(defun subed--get-milliseconds-adjust (arg)
+(defun subed-get-milliseconds-adjust (arg)
   "Set `subed-milliseconds-adjust' to `arg' if it's a number.  If
 `arg' is non-nil, reset `subed-milliseconds-adjust' to its
-default.  Return (new) `subed-milliseconds-adjust' value."
+default.
+Return new `subed-milliseconds-adjust' value."
   (cond ((integerp arg)
           (setq subed-milliseconds-adjust arg))                     ;; Custom 
adjustment
         ((not (eq nil arg))
@@ -236,8 +237,8 @@ subtitle's start time.")
 subtitle ID and start time of the adjusted subtitle."
   (when subed-subtitle-time-adjusted-hook
     (run-hook-with-args 'subed-subtitle-time-adjusted-hook
-                        (subed--subtitle-id)
-                        (subed--subtitle-msecs-start))))
+                        (subed-subtitle-id)
+                        (subed-subtitle-msecs-start))))
 
 (defvar-local subed-point-motion-hook nil
   "Functions to call after point changed.")
@@ -249,7 +250,7 @@ subtitle ID and start time of the adjusted subtitle."
   "Keeps track of `(point)' to detect changes.")
 
 (defvar-local subed--status-subtitle-id 1
-  "Keeps track of `(subed--subtitle-id)' to detect changes.")
+  "Keeps track of `(subed-subtitle-id)' to detect changes.")
 
 (defun subed--post-command-handler ()
   "Detect point motion and user entering text and signal hooks."
@@ -265,7 +266,7 @@ subtitle ID and start time of the adjusted subtitle."
       (setq subed--status-point new-point)
       ;; Signal point motion
       (run-hooks 'subed-point-motion-hook)
-      (let ((new-sub-id (subed--subtitle-id)))
+      (let ((new-sub-id (subed-subtitle-id)))
         (when (and new-sub-id subed--status-subtitle-id
                    (not (= subed--status-subtitle-id new-sub-id)))
           (setq subed--status-subtitle-id new-sub-id)
diff --git a/subed/subed-srt.el b/subed/subed-srt.el
index 2aa46b1..50d54b2 100644
--- a/subed/subed-srt.el
+++ b/subed/subed-srt.el
@@ -499,7 +499,7 @@ each subtitle."
   (interactive)
   (atomic-change-group
     (save-match-data
-      (subed--save-excursion
+      (subed-save-excursion
        ;; Remove trailing whitespace from each line
        (delete-trailing-whitespace (point-min) (point-max))
 
@@ -571,7 +571,7 @@ each subtitle."
   (atomic-change-group
     (subed-srt--sanitize)
     (subed-srt--validate)
-    (subed--save-excursion
+    (subed-save-excursion
      (goto-char (point-min))
      (sort-subr nil
                 ;; nextrecfun (move to next record/subtitle or to end-of-buffer
diff --git a/subed/subed.el b/subed/subed.el
index 66385fd..9585a4b 100644
--- a/subed/subed.el
+++ b/subed/subed.el
@@ -38,13 +38,13 @@
 ;; Abstraction layer to allow support for other subtitle formats
 (set 'subed-font-lock-keywords #'subed-srt-font-lock-keywords)
 
-(fset 'subed--subtitle-id #'subed-srt--subtitle-id)
-(fset 'subed--subtitle-msecs-start #'subed-srt--subtitle-msecs-start)
-(fset 'subed--subtitle-msecs-stop #'subed-srt--subtitle-msecs-stop)
-(fset 'subed--subtitle-text #'subed-srt--subtitle-text)
-(fset 'subed--subtitle-relative-point #'subed-srt--subtitle-relative-point)
-(fset 'subed--adjust-subtitle-start #'subed-srt--adjust-subtitle-start)
-(fset 'subed--adjust-subtitle-stop #'subed-srt--adjust-subtitle-stop)
+(fset 'subed-subtitle-id #'subed-srt--subtitle-id)
+(fset 'subed-subtitle-msecs-start #'subed-srt--subtitle-msecs-start)
+(fset 'subed-subtitle-msecs-stop #'subed-srt--subtitle-msecs-stop)
+(fset 'subed-subtitle-text #'subed-srt--subtitle-text)
+(fset 'subed-subtitle-relative-point #'subed-srt--subtitle-relative-point)
+(fset 'subed-adjust-subtitle-start #'subed-srt--adjust-subtitle-start)
+(fset 'subed-adjust-subtitle-stop #'subed-srt--adjust-subtitle-stop)
 
 (fset 'subed-jump-to-subtitle-id #'subed-srt--jump-to-subtitle-id)
 (fset 'subed-jump-to-subtitle-time-start 
#'subed-srt--jump-to-subtitle-time-start)
@@ -119,13 +119,13 @@
 
 ;;; Utilities
 
-(defmacro subed--save-excursion (&rest body)
+(defmacro subed-save-excursion (&rest body)
   "Restore relative point within current subtitle after executing BODY.
 This also works if the buffer changes (e.g. when sorting
 subtitles) as long the subtitle IDs don't change."
   (save-excursion
-    `(let ((sub-id (subed--subtitle-id))
-           (sub-pos (subed--subtitle-relative-point)))
+    `(let ((sub-id (subed-subtitle-id))
+           (sub-pos (subed-subtitle-relative-point)))
        (progn ,@body)
        (subed-jump-to-subtitle-id sub-id)
        ;; Subtitle text may have changed and we may not be able to move to the
@@ -135,7 +135,7 @@ subtitles) as long the subtitle IDs don't change."
          ('beginning-of-buffer nil)
          ('end-of-buffer nil)))))
 
-(defmacro subed--for-each-subtitle (&optional beg end &rest body)
+(defmacro subed-for-each-subtitle (&optional beg end &rest body)
   "Run BODY for each subtitle between the region specified by BEG and END.
 If END is nil, it defaults to `point-max'.
 If BEG and END are both nil, run BODY only on the subtitle at point.
@@ -158,7 +158,7 @@ Before BODY is run, point is placed on the subtitle's ID."
              (unless (subed-forward-subtitle-id)
                (throw 'last-subtitle-reached t))))))))
 
-(defmacro subed--with-subtitle-replay-disabled (&rest body)
+(defmacro subed-with-subtitle-replay-disabled (&rest body)
   "Run BODY while automatic subtitle replay is disabled."
   (declare (indent defun))
   `(let ((replay-was-enabled-p (subed-replay-adjusted-subtitle-p)))
@@ -193,7 +193,7 @@ Example usage:
        \\[universal-argument] \\[subed-increase-start-time]  Increase start 
time by 100ms (the default)
            \\[subed-increase-start-time]  Increase start time by 100ms (the 
default) again"
   (interactive "P")
-  (subed--adjust-subtitle-start (subed--get-milliseconds-adjust arg)))
+  (subed-adjust-subtitle-start (subed-get-milliseconds-adjust arg)))
 
 (defun subed-decrease-start-time (&optional arg)
   "Subtract `subed-milliseconds-adjust' milliseconds from start
@@ -201,7 +201,7 @@ time of current subtitle.
 Return new start time in milliseconds or nil if it didn't change.
 See also `subed-increase-start-time'."
   (interactive "P")
-  (subed--adjust-subtitle-start (* -1 (subed--get-milliseconds-adjust arg))))
+  (subed-adjust-subtitle-start (* -1 (subed-get-milliseconds-adjust arg))))
 
 (defun subed-increase-stop-time (&optional arg)
   "Add `subed-milliseconds-adjust' milliseconds to stop time of
@@ -209,7 +209,7 @@ current subtitle.
 Return new stop time in milliseconds or nil if it didn't change.
 See also `subed-increase-start-time'."
   (interactive "P")
-  (subed--adjust-subtitle-stop (subed--get-milliseconds-adjust arg)))
+  (subed-adjust-subtitle-stop (subed-get-milliseconds-adjust arg)))
 
 (defun subed-decrease-stop-time (&optional arg)
   "Subtract `subed-milliseconds-adjust' milliseconds from stop
@@ -217,7 +217,7 @@ time of current subtitle.
 Return new stop time in milliseconds or nil if it didn't change.
 See also `subed-increase-start-time'."
   (interactive "P")
-  (subed--adjust-subtitle-stop (* -1 (subed--get-milliseconds-adjust arg))))
+  (subed-adjust-subtitle-stop (* -1 (subed-get-milliseconds-adjust arg))))
 
 
 ;;; Moving subtitles
@@ -230,21 +230,21 @@ If END is nil, move all subtitles from BEG to end of 
buffer.
 If BEG is nil, move only the current subtitle.
 After subtitles are moved is done, replay the first moved
 subtitle if replaying is enabled."
-  (subed--with-subtitle-replay-disabled
-    (subed--for-each-subtitle beg end
+  (subed-with-subtitle-replay-disabled
+    (subed-for-each-subtitle beg end
       (if (> msecs 0)
           ;; Moving subtitles forward may reduce MSECS if there isn't enough
           ;; room for the full movement.  Using the MSECS the stop time was
           ;; moved to move the start time ensures that subtitle length doesn't
           ;; change.
-          (let ((msecs (subed--adjust-subtitle-stop msecs)))
-            (when msecs (subed--adjust-subtitle-start msecs)))
-        (let ((msecs (subed--adjust-subtitle-start msecs)))
-          (when msecs (subed--adjust-subtitle-stop msecs))))))
+          (let ((msecs (subed-adjust-subtitle-stop msecs)))
+            (when msecs (subed-adjust-subtitle-start msecs)))
+        (let ((msecs (subed-adjust-subtitle-start msecs)))
+          (when msecs (subed-adjust-subtitle-stop msecs))))))
   (when (subed-replay-adjusted-subtitle-p)
     (save-excursion
       (when beg (goto-char beg))
-      (subed-mpv-jump (subed--subtitle-msecs-start)))))
+      (subed-mpv-jump (subed-subtitle-msecs-start)))))
 
 (defun subed-move-subtitle-forward (&optional arg)
   "Move subtitle `subed-milliseconds-adjust' forward in time
@@ -268,7 +268,7 @@ Example usage:
            \\[subed-move-subtitle-forward]  Move subtitle 100ms (the default) 
forward in time again"
   (interactive "P")
   (let ((deactivate-mark nil)
-        (msecs (subed--get-milliseconds-adjust arg))
+        (msecs (subed-get-milliseconds-adjust arg))
         (beg (when (use-region-p) (region-beginning)))
         (end (when (use-region-p) (region-end))))
     (subed-move-subtitles msecs beg end)))
@@ -281,7 +281,7 @@ by the same amount.
 See `subed-move-subtitle-forward'."
   (interactive "P")
   (let ((deactivate-mark nil)
-        (msecs (* -1 (subed--get-milliseconds-adjust arg)))
+        (msecs (* -1 (subed-get-milliseconds-adjust arg)))
         (beg (when (use-region-p) (region-beginning)))
         (end (when (use-region-p) (region-end))))
     (subed-move-subtitles msecs beg end)))
@@ -295,7 +295,7 @@ See `subed-move-subtitle-forward'."
 the subtitles between point and the end of the buffer."
   (interactive "P")
   (let ((deactivate-mark nil)
-        (msecs (subed--get-milliseconds-adjust arg))
+        (msecs (subed-get-milliseconds-adjust arg))
         (beg (if (use-region-p) (region-beginning) (point))))
     (subed-move-subtitles msecs beg)))
 
@@ -304,7 +304,7 @@ the subtitles between point and the end of the buffer."
 the subtitles between point and the end of the buffer."
   (interactive "P")
   (let ((deactivate-mark nil)
-        (msecs (* -1 (subed--get-milliseconds-adjust arg)))
+        (msecs (* -1 (subed-get-milliseconds-adjust arg)))
         (beg (if (use-region-p) (region-beginning) (point))))
     (subed-move-subtitles msecs beg)))
 
@@ -386,7 +386,7 @@ playing subtitle."
   (when (and (not (use-region-p))
              (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))
+                 (subed-srt--msecs-to-timestamp msecs) (subed-subtitle-id))
     ;; post-command-hook is not triggered because we didn't move interactively.
     ;; But there's not really a difference, e.g. the minor mode `hl-line' 
breaks
     ;; unless we call its post-command function, so we do it manually.
@@ -448,14 +448,14 @@ subtitle at point."
 (defun subed--sync-player-to-point ()
   "Seek player to currently focused subtitle."
   (subed-debug "Seeking player to subtitle at point %s" (point))
-  (let ((cur-sub-start (subed--subtitle-msecs-start))
-        (cur-sub-stop (subed--subtitle-msecs-stop)))
+  (let ((cur-sub-start (subed-subtitle-msecs-start))
+        (cur-sub-stop (subed-subtitle-msecs-stop)))
     (when (and subed-mpv-playback-position cur-sub-start cur-sub-stop
                (or (< subed-mpv-playback-position cur-sub-start)
                    (> subed-mpv-playback-position cur-sub-stop)))
       (subed-mpv-jump cur-sub-start)
       (subed-debug "Synchronized playback position to point: #%s -> %s"
-                   (subed--subtitle-id) cur-sub-start))))
+                   (subed-subtitle-id) cur-sub-start))))
 
 
 ;;; Loop over single subtitle
@@ -479,16 +479,16 @@ subtitle."
         (when (not quiet)
           (message "Disabled looping")))
     (progn
-      (subed--set-subtitle-loop (subed--subtitle-id))
+      (subed--set-subtitle-loop (subed-subtitle-id))
       (add-hook 'subed-mpv-playback-position-hook 
#'subed--ensure-subtitle-loop :append :local)
       (add-hook 'subed-subtitle-motion-hook #'subed--set-subtitle-loop :append 
:local)
       (subed-debug "Enabling loop: %s - %s" subed--subtitle-loop-start 
subed--subtitle-loop-stop))))
 
 (defun subed--set-subtitle-loop (&optional sub-id)
   "Set loop positions to start/stop time of SUB-ID or current subtitle."
-  (setq subed--subtitle-loop-start (- (subed--subtitle-msecs-start sub-id)
+  (setq subed--subtitle-loop-start (- (subed-subtitle-msecs-start sub-id)
                                       (* subed-loop-seconds-before 1000))
-        subed--subtitle-loop-stop (+ (subed--subtitle-msecs-stop sub-id)
+        subed--subtitle-loop-stop (+ (subed-subtitle-msecs-stop sub-id)
                                      (* subed-loop-seconds-after 1000)))
   (subed-debug "Set loop: %s - %s"
                (subed-srt--msecs-to-timestamp subed--subtitle-loop-start)
diff --git a/tests/test-subed-srt.el b/tests/test-subed-srt.el
index 60061e8..6e8aa44 100644
--- a/tests/test-subed-srt.el
+++ b/tests/test-subed-srt.el
@@ -782,7 +782,7 @@ Baz.
                                           "Bar.\n"))
                           (subed-jump-to-subtitle-id 1)
                           (expect (subed-increase-stop-time 1) :to-be nil)
-                          (expect (subed--subtitle-msecs-stop) :to-equal 
2000)))
+                          (expect (subed-subtitle-msecs-stop) :to-equal 2000)))
                     (it "without overshooting the target time."
                         (with-temp-buffer
                           (insert (concat "1\n"
@@ -793,7 +793,7 @@ Baz.
                                           "Bar.\n"))
                           (subed-jump-to-subtitle-id 2)
                           (expect (subed-decrease-start-time 1) :to-be nil)
-                          (expect (subed--subtitle-msecs-start) :to-equal 
2000)))
+                          (expect (subed-subtitle-msecs-start) :to-equal 
2000)))
                     )
           (it "does nothing if no timestamp can be found."
               (with-temp-buffer
diff --git a/tests/test-subed.el b/tests/test-subed.el
index 885bb8f..6dad9ab 100644
--- a/tests/test-subed.el
+++ b/tests/test-subed.el
@@ -7,7 +7,7 @@
               (with-temp-buffer
                 (insert mock-srt-data)
                 (subed-jump-to-subtitle-time-stop 1)
-                (subed--for-each-subtitle nil nil
+                (subed-for-each-subtitle nil nil
                   (expect (looking-at "^[0-9]$") :to-be t)
                   (forward-line 2)
                   (kill-line)
@@ -17,7 +17,7 @@
                 (expect (subed-srt--subtitle-text 3) :to-equal "Baz.")
                 (expect (point) :to-equal 20)
                 (subed-jump-to-subtitle-time-stop 2)
-                (subed--for-each-subtitle nil nil
+                (subed-for-each-subtitle nil nil
                   (expect (looking-at "^[0-9]$") :to-be t)
                   (forward-line 2)
                   (kill-line)
@@ -27,7 +27,7 @@
                 (expect (subed-srt--subtitle-text 3) :to-equal "Baz.")
                 (expect (point) :to-equal 60)
                 (subed-jump-to-subtitle-time-stop 3)
-                (subed--for-each-subtitle nil nil
+                (subed-for-each-subtitle nil nil
                   (expect (looking-at "^[0-9]$") :to-be t)
                   (forward-line 2)
                   (kill-line)
@@ -41,7 +41,7 @@
                 (insert mock-srt-data)
                 (subed-jump-to-subtitle-time-start 1)
                 (expect (point) :to-equal 3)
-                (subed--for-each-subtitle 71 nil
+                (subed-for-each-subtitle 71 nil
                   (expect (looking-at "^[0-9]$") :to-be t)
                   (forward-line 2)
                   (kill-line)
@@ -55,27 +55,27 @@
                         (with-temp-buffer
                           (insert mock-srt-data)
                           (subed-jump-to-subtitle-time-stop 1)
-                          (subed--for-each-subtitle 71 79
+                          (subed-for-each-subtitle 71 79
                             (expect (looking-at "^[0-9]$") :to-be t)
                             (forward-line 2)
                             (kill-line)
                             (insert "Hello."))
-                          (expect (subed--subtitle-text 1) :to-equal "Foo.")
-                          (expect (subed--subtitle-text 2) :to-equal "Hello.")
-                          (expect (subed--subtitle-text 3) :to-equal "Hello.")
+                          (expect (subed-subtitle-text 1) :to-equal "Foo.")
+                          (expect (subed-subtitle-text 2) :to-equal "Hello.")
+                          (expect (subed-subtitle-text 3) :to-equal "Hello.")
                           (expect (point) :to-equal 20)))
                     (it "excluding subtitles below."
                         (with-temp-buffer
                           (insert mock-srt-data)
                           (subed-jump-to-subtitle-time-stop 3)
-                          (subed--for-each-subtitle 5 76
+                          (subed-for-each-subtitle 5 76
                             (expect (looking-at "^[0-9]$") :to-be t)
                             (forward-line 2)
                             (kill-line)
                             (insert "Hello."))
-                          (expect (subed--subtitle-text 1) :to-equal "Hello.")
-                          (expect (subed--subtitle-text 2) :to-equal "Hello.")
-                          (expect (subed--subtitle-text 3) :to-equal "Baz.")
+                          (expect (subed-subtitle-text 1) :to-equal "Hello.")
+                          (expect (subed-subtitle-text 2) :to-equal "Hello.")
+                          (expect (subed-subtitle-text 3) :to-equal "Baz.")
                           (expect (point) :to-equal 99)))
                     )
           )
@@ -86,14 +86,14 @@
                 (insert mock-srt-data)
                 (cl-loop for sub-id in '(1 2 3) do
                          (subed-jump-to-subtitle-id sub-id)
-                         (let ((orig-start (subed--subtitle-msecs-start))
-                               (orig-stop (subed--subtitle-msecs-stop)))
+                         (let ((orig-start (subed-subtitle-msecs-start))
+                               (orig-stop (subed-subtitle-msecs-stop)))
                            (subed-move-subtitle-forward 100)
-                           (expect (subed--subtitle-msecs-start) :to-equal (+ 
orig-start 100))
-                           (expect (subed--subtitle-msecs-stop) :to-equal (+ 
orig-stop 100))
+                           (expect (subed-subtitle-msecs-start) :to-equal (+ 
orig-start 100))
+                           (expect (subed-subtitle-msecs-stop) :to-equal (+ 
orig-stop 100))
                            (subed-move-subtitle-backward 100)
-                           (expect (subed--subtitle-msecs-start) :to-equal 
orig-start)
-                           (expect (subed--subtitle-msecs-stop) :to-equal 
orig-stop)))))
+                           (expect (subed-subtitle-msecs-start) :to-equal 
orig-start)
+                           (expect (subed-subtitle-msecs-stop) :to-equal 
orig-stop)))))
           (it "adjusts start and stop time by the same amount when adding 
fails."
               (with-temp-buffer
                 (insert (concat "1\n"
@@ -104,8 +104,8 @@
                                 "Bar.\n"))
                 (subed-jump-to-subtitle-id 1)
                 (subed-move-subtitle-forward 1000)
-                (expect (subed--subtitle-msecs-start) :to-equal 1300)
-                (expect (subed--subtitle-msecs-stop) :to-equal 1900)))
+                (expect (subed-subtitle-msecs-start) :to-equal 1300)
+                (expect (subed-subtitle-msecs-stop) :to-equal 1900)))
           (it "adjusts start and stop time by the same amount when subtracting 
fails."
               (with-temp-buffer
                 (insert (concat "1\n"
@@ -116,8 +116,8 @@
                                 "Bar.\n"))
                 (subed-jump-to-subtitle-id 2)
                 (subed-move-subtitle-backward 1000)
-                (expect (subed--subtitle-msecs-start) :to-equal 1700)
-                (expect (subed--subtitle-msecs-stop) :to-equal 2700)))
+                (expect (subed-subtitle-msecs-start) :to-equal 1700)
+                (expect (subed-subtitle-msecs-stop) :to-equal 2700)))
           (it "does not adjust start time if adjusting stop time fails."
               (with-temp-buffer
                 (insert (concat "1\n"
@@ -128,10 +128,10 @@
                                 "Bar.\n"))
                 (subed-jump-to-subtitle-id 1)
                 (expect (subed-move-subtitle-forward 1) :to-be nil)
-                (expect (subed--subtitle-msecs-start 1) :to-equal 1000)
-                (expect (subed--subtitle-msecs-stop 1) :to-equal 2000)
-                (expect (subed--subtitle-msecs-start 2) :to-equal 2000)
-                (expect (subed--subtitle-msecs-stop 2) :to-equal 3000)))
+                (expect (subed-subtitle-msecs-start 1) :to-equal 1000)
+                (expect (subed-subtitle-msecs-stop 1) :to-equal 2000)
+                (expect (subed-subtitle-msecs-start 2) :to-equal 2000)
+                (expect (subed-subtitle-msecs-stop 2) :to-equal 3000)))
           (it "does not adjust stop time if adjusting start time fails."
               (with-temp-buffer
                 (insert (concat "1\n"
@@ -142,67 +142,67 @@
                                 "Bar.\n"))
                 (subed-jump-to-subtitle-id 2)
                 (expect (subed-move-subtitle-backward 1) :to-be nil)
-                (expect (subed--subtitle-msecs-start 1) :to-equal 1000)
-                (expect (subed--subtitle-msecs-stop 1) :to-equal 2000)
-                (expect (subed--subtitle-msecs-start 2) :to-equal 2000)
-                (expect (subed--subtitle-msecs-stop 2) :to-equal 3000)))
+                (expect (subed-subtitle-msecs-start 1) :to-equal 1000)
+                (expect (subed-subtitle-msecs-stop 1) :to-equal 2000)
+                (expect (subed-subtitle-msecs-start 2) :to-equal 2000)
+                (expect (subed-subtitle-msecs-stop 2) :to-equal 3000)))
           (describe "adjusts subtitles in the active region,"
                     (it "excluding the first subtitle."
                         (with-temp-buffer
                           (insert mock-srt-data)
                           (let ((beg (subed-jump-to-subtitle-text 2))
                                 (end (subed-jump-to-subtitle-time-start 3))
-                                (orig-start-1 (subed--subtitle-msecs-start 1))
-                                (orig-stop-1 (subed--subtitle-msecs-stop 1))
-                                (orig-start-2 (subed--subtitle-msecs-start 2))
-                                (orig-stop-2 (subed--subtitle-msecs-stop 2))
-                                (orig-start-3 (subed--subtitle-msecs-start 3))
-                                (orig-stop-3 (subed--subtitle-msecs-stop 3)))
+                                (orig-start-1 (subed-subtitle-msecs-start 1))
+                                (orig-stop-1 (subed-subtitle-msecs-stop 1))
+                                (orig-start-2 (subed-subtitle-msecs-start 2))
+                                (orig-stop-2 (subed-subtitle-msecs-stop 2))
+                                (orig-start-3 (subed-subtitle-msecs-start 3))
+                                (orig-stop-3 (subed-subtitle-msecs-stop 3)))
                             (spy-on 'use-region-p :and-return-value t)
                             (spy-on 'region-beginning :and-return-value beg)
                             (spy-on 'region-end :and-return-value end)
                             (subed-move-subtitle-forward 100)
-                            (expect (subed--subtitle-msecs-start 1) :to-equal 
orig-start-1)
-                            (expect (subed--subtitle-msecs-stop 1) :to-equal 
orig-stop-1)
-                            (expect (subed--subtitle-msecs-start 2) :to-equal 
(+ orig-start-2 100))
-                            (expect (subed--subtitle-msecs-stop 2) :to-equal 
(+ orig-stop-2 100))
-                            (expect (subed--subtitle-msecs-start 3) :to-equal 
(+ orig-start-3 100))
-                            (expect (subed--subtitle-msecs-stop 3) :to-equal 
(+ orig-stop-3 100))
+                            (expect (subed-subtitle-msecs-start 1) :to-equal 
orig-start-1)
+                            (expect (subed-subtitle-msecs-stop 1) :to-equal 
orig-stop-1)
+                            (expect (subed-subtitle-msecs-start 2) :to-equal 
(+ orig-start-2 100))
+                            (expect (subed-subtitle-msecs-stop 2) :to-equal (+ 
orig-stop-2 100))
+                            (expect (subed-subtitle-msecs-start 3) :to-equal 
(+ orig-start-3 100))
+                            (expect (subed-subtitle-msecs-stop 3) :to-equal (+ 
orig-stop-3 100))
                             (subed-move-subtitle-backward 200)
-                            (expect (subed--subtitle-msecs-start 1) :to-equal 
orig-start-1)
-                            (expect (subed--subtitle-msecs-stop 1) :to-equal 
orig-stop-1)
-                            (expect (subed--subtitle-msecs-start 2) :to-equal 
(- orig-start-2 100))
-                            (expect (subed--subtitle-msecs-stop 2) :to-equal 
(- orig-stop-2 100))
-                            (expect (subed--subtitle-msecs-start 3) :to-equal 
(- orig-start-3 100))
-                            (expect (subed--subtitle-msecs-stop 3) :to-equal 
(- orig-stop-3 100)))))
+                            (expect (subed-subtitle-msecs-start 1) :to-equal 
orig-start-1)
+                            (expect (subed-subtitle-msecs-stop 1) :to-equal 
orig-stop-1)
+                            (expect (subed-subtitle-msecs-start 2) :to-equal 
(- orig-start-2 100))
+                            (expect (subed-subtitle-msecs-stop 2) :to-equal (- 
orig-stop-2 100))
+                            (expect (subed-subtitle-msecs-start 3) :to-equal 
(- orig-start-3 100))
+                            (expect (subed-subtitle-msecs-stop 3) :to-equal (- 
orig-stop-3 100)))))
                     (it "excluding the last subtitle."
                         (with-temp-buffer
                           (insert mock-srt-data)
                           (let ((beg (subed-jump-to-subtitle-time-stop 1))
                                 (end (1+ (subed-jump-to-subtitle-end 2)))
-                                (orig-start-1 (subed--subtitle-msecs-start 1))
-                                (orig-stop-1 (subed--subtitle-msecs-stop 1))
-                                (orig-start-2 (subed--subtitle-msecs-start 2))
-                                (orig-stop-2 (subed--subtitle-msecs-stop 2))
-                                (orig-start-3 (subed--subtitle-msecs-start 3))
-                                (orig-stop-3 (subed--subtitle-msecs-stop 3)))
+                                (orig-start-1 (subed-subtitle-msecs-start 1))
+                                (orig-stop-1 (subed-subtitle-msecs-stop 1))
+                                (orig-start-2 (subed-subtitle-msecs-start 2))
+                                (orig-stop-2 (subed-subtitle-msecs-stop 2))
+                                (orig-start-3 (subed-subtitle-msecs-start 3))
+                                (orig-stop-3 (subed-subtitle-msecs-stop 3)))
                             (spy-on 'use-region-p :and-return-value t)
                             (spy-on 'region-beginning :and-return-value beg)
                             (spy-on 'region-end :and-return-value end)
                             (subed-move-subtitle-forward 100)
-                            (expect (subed--subtitle-msecs-start 1) :to-equal 
(+ orig-start-1 100))
-                            (expect (subed--subtitle-msecs-stop 1) :to-equal 
(+ orig-stop-1 100))
-                            (expect (subed--subtitle-msecs-start 2) :to-equal 
(+ orig-start-2 100))
-                            (expect (subed--subtitle-msecs-stop 2) :to-equal 
(+ orig-stop-2 100))
-                            (expect (subed--subtitle-msecs-start 3) :to-equal 
orig-start-3)
-                            (expect (subed--subtitle-msecs-stop 3) :to-equal 
orig-stop-3)
+                            (expect (subed-subtitle-msecs-start 1) :to-equal 
(+ orig-start-1 100))
+                            (expect (subed-subtitle-msecs-stop 1) :to-equal (+ 
orig-stop-1 100))
+                            (expect (subed-subtitle-msecs-start 2) :to-equal 
(+ orig-start-2 100))
+                            (expect (subed-subtitle-msecs-stop 2) :to-equal (+ 
orig-stop-2 100))
+                            (expect (subed-subtitle-msecs-start 3) :to-equal 
orig-start-3)
+                            (expect (subed-subtitle-msecs-stop 3) :to-equal 
orig-stop-3)
                             (subed-move-subtitle-backward 300)
-                            (expect (subed--subtitle-msecs-start 1) :to-equal 
(- orig-start-1 200))
-                            (expect (subed--subtitle-msecs-stop 1) :to-equal 
(- orig-stop-1 200))
-                            (expect (subed--subtitle-msecs-start 2) :to-equal 
(- orig-start-2 200))
-                            (expect (subed--subtitle-msecs-stop 2) :to-equal 
(- orig-stop-2 200))
-                            (expect (subed--subtitle-msecs-start 3) :to-equal 
orig-start-3)
-                            (expect (subed--subtitle-msecs-stop 3) :to-equal 
orig-stop-3)
+                            (expect (subed-subtitle-msecs-start 1) :to-equal 
(- orig-start-1 200))
+                            (expect (subed-subtitle-msecs-stop 1) :to-equal (- 
orig-stop-1 200))
+                            (expect (subed-subtitle-msecs-start 2) :to-equal 
(- orig-start-2 200))
+                            (expect (subed-subtitle-msecs-stop 2) :to-equal (- 
orig-stop-2 200))
+                            (expect (subed-subtitle-msecs-start 3) :to-equal 
orig-start-3)
+                            (expect (subed-subtitle-msecs-stop 3) :to-equal 
orig-stop-3)
                             )))
                     )
           (it "disables subtitle replay while moving subtitles."
@@ -211,9 +211,9 @@
                 (subed-enable-replay-adjusted-subtitle :quiet)
                 (spy-on 'subed-enable-replay-adjusted-subtitle 
:and-call-through)
                 (spy-on 'subed-disable-replay-adjusted-subtitle 
:and-call-through)
-                (spy-on 'subed--adjust-subtitle-start :and-call-fake
+                (spy-on 'subed-adjust-subtitle-start :and-call-fake
                         (lambda (msecs) (expect 
(subed-replay-adjusted-subtitle-p) :to-be nil)))
-                (spy-on 'subed--adjust-subtitle-stop :and-call-fake
+                (spy-on 'subed-adjust-subtitle-stop :and-call-fake
                         (lambda (msecs) (expect 
(subed-replay-adjusted-subtitle-p) :to-be nil)))
                 (subed-move-subtitle-forward 100)
                 (expect 'subed-disable-replay-adjusted-subtitle 
:to-have-been-called-times 1)
@@ -227,9 +227,9 @@
                 (subed-disable-replay-adjusted-subtitle :quiet)
                 (spy-on 'subed-enable-replay-adjusted-subtitle 
:and-call-through)
                 (spy-on 'subed-disable-replay-adjusted-subtitle 
:and-call-through)
-                (spy-on 'subed--adjust-subtitle-start :and-call-fake
+                (spy-on 'subed-adjust-subtitle-start :and-call-fake
                         (lambda (msecs) (expect 
(subed-replay-adjusted-subtitle-p) :to-be nil)))
-                (spy-on 'subed--adjust-subtitle-stop :and-call-fake
+                (spy-on 'subed-adjust-subtitle-stop :and-call-fake
                         (lambda (msecs) (expect 
(subed-replay-adjusted-subtitle-p) :to-be nil)))
                 (subed-move-subtitle-forward 100)
                 (expect 'subed-disable-replay-adjusted-subtitle 
:to-have-been-called-times 1)
@@ -270,8 +270,8 @@
           :var (subed-mpv-playback-position)
           (before-each
            (setq subed-mpv-playback-position 0)
-           (spy-on 'subed--subtitle-msecs-start :and-return-value 5000)
-           (spy-on 'subed--subtitle-msecs-stop :and-return-value 6500)
+           (spy-on 'subed-subtitle-msecs-start :and-return-value 5000)
+           (spy-on 'subed-subtitle-msecs-stop :and-return-value 6500)
            (spy-on 'subed-mpv-jump))
           (it "does not seek player if point is on current subtitle."
               (setq subed-mpv-playback-position 5000)