summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSacha Chua <sacha@sachachua.com>2025-11-27 14:40:06 -0500
committerSacha Chua <sacha@sachachua.com>2025-11-27 14:40:17 -0500
commit789efdd05da403310c954497588c43fe94d4edd8 (patch)
tree1316bd18b0325e992333a605716e4ff9393e592a
parent69ee6aaee7fa7577612ddd434370bdd8b299f813 (diff)
downloademacsconf-el-789efdd05da403310c954497588c43fe94d4edd8.tar.xz
emacsconf-el-789efdd05da403310c954497588c43fe94d4edd8.zip
splitting
-rw-r--r--emacsconf-subed.el16
1 files changed, 11 insertions, 5 deletions
diff --git a/emacsconf-subed.el b/emacsconf-subed.el
index 422aec3..82a07ad 100644
--- a/emacsconf-subed.el
+++ b/emacsconf-subed.el
@@ -297,14 +297,20 @@ Create it if necessary."
(interactive "e")
(goto-char (posn-point (event-start event)))
(skip-syntax-backward "w")
- (subed-split-subtitle)
+ (if (derived-mode-p 'subed-mode)
+ (subed-split-subtitle)
+ (insert "\n"))
(recenter))
(defun emacsconf-subed-merge-and-unfill ()
"Merge this subtitle with the next one."
(interactive)
- (subed-merge-with-next)
- (emacsconf-subed-unfill-paragraph))
+ (if (derived-mode-p 'subed-mode)
+ (progn
+ (subed-merge-with-next)
+ (emacsconf-subed-unfill-paragraph))
+ (goto-char (line-end-position))
+ (join-line)))
(defun emacsconf-subed-unfill-paragraph ()
"Sometimes the regular fill doesn't work."
@@ -356,8 +362,8 @@ Create it if necessary."
(* i 5000)
(1- (* i 5000))
(emacsconf-pad-expand-intro talk)
- (format "#+OUTPUT: %s.webm\n[[file:%s]]"
- (plist-get talk :slug)
+ (format "#+OUTPUT: %s--intro.webm\n[[file:%s]]"
+ (plist-get talk :file-prefix)
(expand-file-name
(concat (plist-get talk :slug) ".png")
(expand-file-name "in-between" emacsconf-stream-asset-dir)))))