emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/subed 9f0c939 260/389: subed-for-each-subtitle: Make all a


From: ELPA Syncer
Subject: [nongnu] elpa/subed 9f0c939 260/389: subed-for-each-subtitle: Make all arguments mandatory
Date: Fri, 3 Dec 2021 11:00:38 -0500 (EST)

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

    subed-for-each-subtitle: Make all arguments mandatory
    
    This fixes subed-shift-subtitle-backward, which only shifted the current 
and the
    next subtitle.
---
 subed/subed-common.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/subed/subed-common.el b/subed/subed-common.el
index 1d33620..54f53f6 100644
--- a/subed/subed-common.el
+++ b/subed/subed-common.el
@@ -92,7 +92,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 reverse &rest body)
+(defmacro subed-for-each-subtitle (beg end reverse &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.
@@ -312,6 +312,7 @@ because we'd overlap with the next subtitle.
 When moving subtitles backward (MSECS < 0), it's the same thing
 but we move the start time first."
   (if (> msecs 0)
+      ;; Moving forward
       (lambda (msecs &optional ignore-limits)
         (let ((msecs (subed-adjust-subtitle-time-stop msecs
                                                       :ignore-negative-duration
@@ -319,6 +320,7 @@ but we move the start time first."
           (when msecs (subed-adjust-subtitle-time-start msecs
                                                         
:ignore-negative-duration
                                                         ignore-limits))))
+    ;; Moving backward
     (lambda (msecs &optional ignore-limits)
       (let ((msecs (subed-adjust-subtitle-time-start msecs
                                                      :ignore-negative-duration
@@ -366,7 +368,7 @@ but we move the start time first."
               (unless (setq msecs (move-subtitle msecs))
                 (throw 'bumped-into-subtitle t))
               (subed-forward-subtitle-id)
-              (subed-for-each-subtitle (point) end
+              (subed-for-each-subtitle (point) end nil
                 (move-subtitle msecs :ignore-spacing)))))))))
 
 (defun subed-move-subtitles (msecs &optional beg end)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]