branch: elpa/subed
commit 4522e1a390eb65ddc946138abdd97a8399221475
Author: Random User <rnd...@posteo.de>
Commit: Random User <rnd...@posteo.de>
Change keybindings to better conform with major mode conventions
"The key sequences bound in a major mode keymap should usually start with
C-c,
followed by a control character, a digit, or {, }, <, >, : or ;. The other
punctuation characters are reserved for minor modes, and ordinary letters
are
reserved for users."
https://www.gnu.org/software/emacs/manual/html_node/elisp/Major-Mode-Conventions.html
---
README.org | 14 +++++++-------
subed/subed-config.el | 18 +++++++++---------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/README.org b/README.org
index b59b8ae..f91cc5a 100644
--- a/README.org
+++ b/README.org
@@ -19,7 +19,7 @@ subed is still alpha software. Expect it to kill your Emacs
session.
(~M-s~).
*** mpv integration (optional)
- - Open videos with ~C-x C-v~ or automatically when entering subed-mode if
the
+ - Open videos with ~C-c C-v~ or automatically when entering subed-mode if
the
video file is named like the subtitle file but with a video extension
(e.g. ~.mkv~ or ~.avi~).
- Pause video playback without leaving Emacs (~M-SPC~).
@@ -27,14 +27,14 @@ subed is still alpha software. Expect it to kill your
Emacs session.
and then reloaded in mpv.
- Cursor and playback position are synchronized:
- Playback in mpv seeks to the position of the current subtitle as the
- cursor moves between subtitles (~C-x ,~).
+ cursor moves between subtitles (~C-c ,~).
- The cursor is moved to the currently relevant subtitle as the video is
- playing (~C-x .~).
- - Playback is paused or slowed down when a subtitle's text is edited (~C-x
- p~).
- - Loop over the current subtitle in mpv (~C-x l~).
+ playing (~C-c .~).
+ - Playback is paused or slowed down when a subtitle's text is edited (~C-c
+ C-p~).
+ - Loop over the current subtitle in mpv (~C-c C-l~).
- When a subtitle's start or stop time changes, mpv seeks to the subtitle's
- start time (~C-x /~).
+ start time (~C-c C-r~).
** Installation
For now, you have to install it manually. For example, copy ~subed/*.el~ to
diff --git a/subed/subed-config.el b/subed/subed-config.el
index e31edd5..91f3ffa 100644
--- a/subed/subed-config.el
+++ b/subed/subed-config.el
@@ -38,16 +38,16 @@
(define-key subed-mode-map (kbd "M-i") 'subed-subtitle-insert)
(define-key subed-mode-map (kbd "M-k") 'subed-subtitle-kill)
(define-key subed-mode-map (kbd "M-s") 'subed-sort)
- (define-key subed-mode-map (kbd "C-x C-v") 'subed-mpv-find-video)
(define-key subed-mode-map (kbd "M-SPC") 'subed-mpv-toggle-pause)
- (define-key subed-mode-map (kbd "C-x .")
'subed-toggle-sync-point-to-player)
- (define-key subed-mode-map (kbd "C-x ,")
'subed-toggle-sync-player-to-point)
- (define-key subed-mode-map (kbd "C-x p") 'subed-toggle-pause-while-typing)
- (define-key subed-mode-map (kbd "C-x l") 'subed-toggle-subtitle-loop)
- (define-key subed-mode-map (kbd "C-x /")
'subed-toggle-replay-adjusted-subtitle)
- ;; (define-key subed-mode-map (kbd "C-x [")
'subed-copy-subtitle-start-time)
- ;; (define-key subed-mode-map (kbd "C-x ]") 'subed-copy-subtitle-stop-time)
- (define-key subed-mode-map (kbd "C-x d") 'subed-toggle-debugging)
+ (define-key subed-mode-map (kbd "C-c C-d") 'subed-toggle-debugging)
+ (define-key subed-mode-map (kbd "C-c C-v") 'subed-mpv-find-video)
+ (define-key subed-mode-map (kbd "C-c C-p")
'subed-toggle-pause-while-typing)
+ (define-key subed-mode-map (kbd "C-c C-l") 'subed-toggle-subtitle-loop)
+ (define-key subed-mode-map (kbd "C-c C-r")
'subed-toggle-replay-adjusted-subtitle)
+ ;; (define-key subed-mode-map (kbd "C-c [")
'subed-copy-subtitle-start-time)
+ ;; (define-key subed-mode-map (kbd "C-c ]") 'subed-copy-subtitle-stop-time)
+ (define-key subed-mode-map (kbd "C-c .")
'subed-toggle-sync-point-to-player)
+ (define-key subed-mode-map (kbd "C-c ,")
'subed-toggle-sync-player-to-point)
subed-mode-map)
"Keymap for subed-mode")
