branch: elpa/subed
commit a42ba174da0f2d62ed04f65977283a0d9cf43c92
Author: Random User <rnd...@posteo.de>
Commit: Random User <rnd...@posteo.de>
Simplify subed-srt--subtitle-kill
---
subed/subed-srt.el | 29 +++++++++++------------------
1 file changed, 11 insertions(+), 18 deletions(-)
diff --git a/subed/subed-srt.el b/subed/subed-srt.el
index 60cfc26..dfdf6ce 100644
--- a/subed/subed-srt.el
+++ b/subed/subed-srt.el
@@ -425,25 +425,18 @@ following manner:
(defun subed-srt--subtitle-kill ()
"Remove subtitle at point."
(interactive)
- (let ((beg (save-excursion
- (subed-srt--jump-to-subtitle-id)
- (point)))
- (end (save-excursion
- (subed-srt--jump-to-subtitle-id)
- (when (subed-srt--forward-subtitle-id)
- (point)))))
+ (let ((beg (save-excursion (subed-srt--jump-to-subtitle-id)
+ (point)))
+ (end (save-excursion (subed-srt--jump-to-subtitle-id)
+ (when (subed-srt--forward-subtitle-id)
+ (point)))))
(if (not end)
- (progn
- (let ((beg (save-excursion
- (goto-char beg)
- (subed-srt--backward-subtitle-text)
- (subed-srt--jump-to-subtitle-end)
- (1+ (point))))
- (end (save-excursion
- (goto-char (point-max)))))
- (delete-region beg end)))
- (progn
- (delete-region beg end))))
+ ;; Removing the last subtitle because forward-subtitle-id returned nil
+ (setq beg (save-excursion (goto-char beg)
+ (subed-srt--backward-subtitle-end)
+ (1+ (point)))
+ end (save-excursion (goto-char (point-max)))))
+ (delete-region beg end))
(subed-srt--regenerate-ids-soon))
