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

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

[nongnu] elpa/subed 53efb5f583: Fix TSV fontlocking and improve subed-co


From: ELPA Syncer
Subject: [nongnu] elpa/subed 53efb5f583: Fix TSV fontlocking and improve subed-convert
Date: Tue, 25 Oct 2022 14:59:21 -0400 (EDT)

branch: elpa/subed
commit 53efb5f583fffbb016492756f5b0af505c7feec7
Author: Sacha Chua <sacha@sachachua.com>
Commit: Sacha Chua <sacha@sachachua.com>

    Fix TSV fontlocking and improve subed-convert
    
    * subed/subed-tsv.el (subed-tsv-font-lock-keywords): Fix fontlocking.
    * subed/subed-common.el (subed-convert): Visit a file in the new
    buffer, check for overwriting.
    * NEWS.org: Bump version.
    * subed/subed.el: Bump version.
---
 NEWS.org              |  4 ++++
 subed/subed-common.el | 16 +++++++++-------
 subed/subed-tsv.el    |  2 +-
 subed/subed.el        |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/NEWS.org b/NEWS.org
index f092274fb3..589438e135 100644
--- a/NEWS.org
+++ b/NEWS.org
@@ -1,4 +1,8 @@
 * subed news
+** Version 1.0.13 - 2022-10-25 - Sacha Chua
+
+Fixed TSV fontlocking.
+Improved subed-convert so that the new buffer is also visiting a file.
 
 ** Version 1.0.12 - 2022-10-23 - Sacha Chua
 
diff --git a/subed/subed-common.el b/subed/subed-common.el
index 91553aeee6..869e2bc144 100644
--- a/subed/subed-common.el
+++ b/subed/subed-common.el
@@ -1818,10 +1818,13 @@ If LIST is nil, use the subtitles in the current 
buffer."
   "Create a buffer with the current subtitles converted to FORMAT.
 You may need to add some extra information to the buffer."
   (interactive (list (completing-read "To format: " '("VTT" "SRT" "ASS" 
"TSV"))))
-  (let ((subtitles (subed-subtitle-list))
-        (buf (generate-new-buffer
-              (concat (file-name-base (or (buffer-file-name) (buffer-name))) 
"." (downcase format)))))
-    (with-current-buffer buf
+  (let* ((subtitles (subed-subtitle-list))
+         (new-filename (concat (file-name-base (or (buffer-file-name) 
(buffer-name))) "." (downcase format)))
+         buf)
+    (when (or (not (file-exists-p new-filename))
+              (yes-or-no-p (format "%s exists. Overwrite? " new-filename)))
+      (find-file new-filename)
+      (erase-buffer)
       (pcase format
         ("VTT" (require 'subed-vtt) (subed-vtt-mode))
         ("SRT" (require 'subed-srt) (subed-srt-mode))
@@ -1830,9 +1833,8 @@ You may need to add some extra information to the buffer."
       (save-excursion
         (subed-auto-insert)
         (mapc (lambda (sub) (apply #'subed-append-subtitle nil (cdr sub))) 
subtitles)
-        (subed-regenerate-ids)))
-    (switch-to-buffer buf)
-    buf))
+        (subed-regenerate-ids))
+      (current-buffer))))
 
 (provide 'subed-common)
 ;;; subed-common.el ends here
diff --git a/subed/subed-tsv.el b/subed/subed-tsv.el
index 184204aa30..b9f5295d61 100644
--- a/subed/subed-tsv.el
+++ b/subed/subed-tsv.el
@@ -39,7 +39,7 @@
 
 (defconst subed-tsv-font-lock-keywords
   (list
-   '("^\\([0-9]+\\.[0-9]+\\)\t\\([0-9]+\\.[0-9]+\\)" (0 subed-tsv-time-face)))
+   '("^\\([0-9]+\\.[0-9]+\\)\t\\([0-9]+\\.[0-9]+\\)" (0 'subed-time-face)))
   "Highlighting expressions for `subed-mode'.")
 
 ;;; Parsing
diff --git a/subed/subed.el b/subed/subed.el
index 4c7b7505b0..c8ac304a6d 100644
--- a/subed/subed.el
+++ b/subed/subed.el
@@ -1,6 +1,6 @@
 ;;; subed.el --- A major mode for editing subtitles  -*- lexical-binding: t; 
-*-
 
-;; Version: 1.0.12
+;; Version: 1.0.13
 ;; Maintainer: Sacha Chua <sacha@sachachua.com>
 ;; Author: Random User
 ;; Keywords: convenience, files, hypermedia, multimedia



reply via email to

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