branch: elpa/subed
commit 7a0c36c808e107b5851ba48ec3825dfa3c1a902e
Author: Sacha Chua <sa...@sachachua.com>
Commit: Sacha Chua <sa...@sachachua.com>
Add maintainer info, fix Makefile targets, change setq to defconst
* Makefile (all): New default target.
(compile): New target.
(test-compile): Use new compile target.
* subed/subed.el: Bump version and add maintainer info. Fix URL.
(subed-mode-map): Change to defconst as suggested by Stefan Monnier.
---
Makefile | 7 +++++--
subed/subed.el | 19 +++++++++++--------
2 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 674b00570b..f122f28807 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,8 @@
#
# SPDX-License-Identifier: GPL-3.0-or-later
+all: clean autoloads compile
+
clean:
find . -name "*.elc" -delete
rm subed/subed-autoloads.el
@@ -33,7 +35,7 @@ autoloads:
emacs --quick --batch --eval "(progn (setq generated-autoload-file
(expand-file-name \"subed-autoloads.el\" \"subed\") backup-inhibited t) \
(update-directory-autoloads \"./subed\"))"
-test-compile:
+compile:
emacs --quick --batch --eval "(progn (add-to-list 'load-path
(expand-file-name \"subed\" default-directory)) \
(byte-compile-file
\"subed/subed.el\"))"
emacs --quick --batch --eval "(progn (add-to-list 'load-path
(expand-file-name \"subed\" default-directory)) \
@@ -50,7 +52,8 @@ test-compile:
(byte-compile-file
\"subed/subed-ass.el\"))"
emacs --quick --batch --eval "(progn (add-to-list 'load-path
(expand-file-name \"subed\" default-directory)) \
(byte-compile-file
\"subed/subed-debug.el\"))"
- make clean
+
+test-compile: compile clean
test-emacs:
emacs -Q -L ./subed --eval "(require 'subed-autoloads)"
diff --git a/subed/subed.el b/subed/subed.el
index 538c0f5cb7..a8fbfb82e4 100644
--- a/subed/subed.el
+++ b/subed/subed.el
@@ -1,8 +1,10 @@
;;; subed.el --- A major mode for editing subtitles -*- lexical-binding: t;
-*-
-;; Version: 1.0.4
+;; Version: 1.0.5
+;; Maintainer: Sacha Chua <sa...@sachachua.com>
+;; Author: Random User
;; Keywords: convenience, files, hypermedia, multimedia
-;; URL: https://github.com/rndusr/subed
+;; URL: https://github.com/sachac/subed
;; Package-Requires: ((emacs "25.1"))
;;; License:
@@ -44,7 +46,7 @@
map)
"A keymap for stepping the video by frames.")
-(setq subed-mode-map
+(defconst subed-mode-map
(let ((subed-mode-map (make-keymap)))
(define-key subed-mode-map (kbd "M-n") #'subed-forward-subtitle-text)
(define-key subed-mode-map (kbd "M-p") #'subed-backward-subtitle-text)
@@ -81,11 +83,12 @@
(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)
(define-key subed-mode-map (kbd "C-c C-t") (let ((html-tag-keymap
(make-sparse-keymap)))
- (define-key html-tag-keymap
(kbd "C-t") #'subed-insert-html-tag)
- (define-key html-tag-keymap
(kbd "C-i") #'subed-insert-html-tag-italic)
- (define-key html-tag-keymap
(kbd "C-b") #'subed-insert-html-tag-bold)
- html-tag-keymap))
- subed-mode-map))
+
(define-key html-tag-keymap (kbd "C-t") #'subed-insert-html-tag)
+
(define-key html-tag-keymap (kbd "C-i") #'subed-insert-html-tag-italic)
+
(define-key html-tag-keymap (kbd "C-b") #'subed-insert-html-tag-bold)
+
html-tag-keymap))
+ subed-mode-map)
+ "A keymap for editing subtitles.")
(defun subed-auto-find-video-maybe ()
"Load video associated with this subtitle file."
