branch: elpa/subed
commit c84e5cb775affc5033e944a3b1c074929d90fe8d
Author: Random User <rnd...@posteo.de>
Commit: Random User <rnd...@posteo.de>
Rename *-subtitle-kill to *-kill-subtitle
---
subed/subed-config.el | 2 +-
subed/subed-srt.el | 2 +-
subed/subed.el | 2 +-
tests/test-subed-srt.el | 10 +++++-----
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/subed/subed-config.el b/subed/subed-config.el
index c03c067..3b49287 100644
--- a/subed/subed-config.el
+++ b/subed/subed-config.el
@@ -42,7 +42,7 @@
(define-key subed-mode-map (kbd "C-M-f") #'subed-shift-subtitle-forward)
(define-key subed-mode-map (kbd "C-M-b") #'subed-shift-subtitle-backward)
(define-key subed-mode-map (kbd "M-i") #'subed-insert-subtitle)
- (define-key subed-mode-map (kbd "M-k") #'subed-subtitle-kill)
+ (define-key subed-mode-map (kbd "M-k") #'subed-kill-subtitle)
(define-key subed-mode-map (kbd "M-s") #'subed-sort)
(define-key subed-mode-map (kbd "M-SPC") #'subed-mpv-toggle-pause)
(define-key subed-mode-map (kbd "C-c C-d") #'subed-toggle-debugging)
diff --git a/subed/subed-srt.el b/subed/subed-srt.el
index c873ddb..ac9ab7a 100644
--- a/subed/subed-srt.el
+++ b/subed/subed-srt.el
@@ -406,7 +406,7 @@ Return new point."
(forward-line -2)
(subed-srt--jump-to-subtitle-text))
-(defun subed-srt--subtitle-kill ()
+(defun subed-srt--kill-subtitle ()
"Remove subtitle at point."
(interactive)
(let ((beg (save-excursion (subed-srt--jump-to-subtitle-id)
diff --git a/subed/subed.el b/subed/subed.el
index 55b192b..5ec3f91 100644
--- a/subed/subed.el
+++ b/subed/subed.el
@@ -69,7 +69,7 @@
(defalias 'subed-set-subtitle-time-stop #'subed-srt--set-subtitle-time-stop)
(defalias 'subed-prepend-subtitle #'subed-srt--prepend-subtitle)
(defalias 'subed-append-subtitle #'subed-srt--append-subtitle)
-(defalias 'subed-subtitle-kill #'subed-srt--subtitle-kill)
+(defalias 'subed-kill-subtitle #'subed-srt--kill-subtitle)
(defalias 'subed-sanitize #'subed-srt--sanitize)
(defalias 'subed-regenerate-ids #'subed-srt--regenerate-ids)
(defalias 'subed-regenerate-ids-soon #'subed-srt--regenerate-ids-soon)
diff --git a/tests/test-subed-srt.el b/tests/test-subed-srt.el
index 15efcc3..dd93864 100644
--- a/tests/test-subed-srt.el
+++ b/tests/test-subed-srt.el
@@ -1121,7 +1121,7 @@ Baz.
(with-temp-buffer
(insert mock-srt-data)
(subed-srt--jump-to-subtitle-text 1)
- (subed-srt--subtitle-kill)
+ (subed-srt--kill-subtitle)
(expect (buffer-string) :to-equal (concat "2\n"
"00:02:02,234 -->
00:02:10,345\n"
"Bar.\n\n"
@@ -1132,7 +1132,7 @@ Baz.
(with-temp-buffer
(insert mock-srt-data)
(subed-srt--jump-to-subtitle-text 2)
- (subed-srt--subtitle-kill)
+ (subed-srt--kill-subtitle)
(expect (buffer-string) :to-equal (concat "1\n"
"00:01:01,000 -->
00:01:05,123\n"
"Foo.\n\n"
@@ -1143,7 +1143,7 @@ Baz.
(with-temp-buffer
(insert mock-srt-data)
(subed-srt--jump-to-subtitle-text 3)
- (subed-srt--subtitle-kill)
+ (subed-srt--kill-subtitle)
(expect (buffer-string) :to-equal (concat "1\n"
"00:01:01,000 -->
00:01:05,123\n"
"Foo.\n\n"
@@ -1157,7 +1157,7 @@ Baz.
(subed-jump-to-subtitle-id 3)
(backward-char)
(expect (looking-at "^\n3\n") :to-be t)
- (subed-srt--subtitle-kill)
+ (subed-srt--kill-subtitle)
(expect (buffer-string) :to-equal (concat "1\n"
"00:01:01,000 -->
00:01:05,123\n"
"Foo.\n\n"
@@ -1170,7 +1170,7 @@ Baz.
(subed-jump-to-subtitle-id 2)
(backward-char)
(expect (looking-at "^\n2\n") :to-be t)
- (subed-srt--subtitle-kill)
+ (subed-srt--kill-subtitle)
(expect (buffer-string) :to-equal (concat "2\n"
"00:02:02,234 -->
00:02:10,345\n"
"Bar.\n\n"
