From ce350490cae7c29614b4a5763c7697f222f26dd4 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Mon, 10 Jun 2024 18:27:58 -0400 Subject: [PATCH 1/3] ob-core: Fix indentation * lisp/ob-core.el (org-babel-execute-src-block): Fix indentation of line. Emacs's bd80717d8e7 (Re-enable TTY glyph production for batch mode frames on Android, 2024-06-10) reverted all changes from 8d1d9798f77 (Fix bootstrap of org.texi, 2024-06-10) aside from an indentation fix. Apply the indentation fix to avoid overwriting it on sync. --- lisp/ob-core.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index c5dd20b0e..d1984b2d6 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -909,7 +909,7 @@ guess will be made." ;; insert a link to `:file'. (when (and result (not (or (member "link" result-params) - (member "graphics" result-params)))) + (member "graphics" result-params)))) (with-temp-file file (insert (org-babel-format-result result From 6eab01c580f2d77858f949bddc950395c1ba2a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Engdeg=C3=A5rd?= Date: Mon, 10 Jun 2024 13:59:31 +0200 Subject: [PATCH 2/3] Backport commit 331573e40 from Emacs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * lisp/org-element.el (org-element-copy-buffer): Repair incorrect escaping. * lisp/org-macs.el (org--line-empty-p): Fix broken skip-set. * lisp/org.el (org-setup-yank-dnd-handlers): Fix broken regexp. Org: fix mistakes in regexp, skip set and doc string 331573e40731d6635acd366694493c26b480c230 Mattias Engdegård Mon Jun 10 14:07:07 2024 +0200 --- lisp/org-element.el | 2 +- lisp/org-macs.el | 2 +- lisp/org.el | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/org-element.el b/lisp/org-element.el index 34520d16e..b15f0b69d 100644 --- a/lisp/org-element.el +++ b/lisp/org-element.el @@ -648,7 +648,7 @@ IMPORTANT: The buffer copy may also have variable `buffer-file-name' copied. To prevent Emacs overwriting the original buffer file, -`write-contents-functions' is set to \='(always). Do not alter this +`write-contents-functions' is set to \\='(always). Do not alter this variable and do not do anything that might alter it (like calling a major mode) to prevent data corruption. Also, do note that Emacs may jump into the created buffer if the original file buffer is closed and diff --git a/lisp/org-macs.el b/lisp/org-macs.el index 555ff44a3..694e747b0 100644 --- a/lisp/org-macs.el +++ b/lisp/org-macs.el @@ -815,7 +815,7 @@ Match at beginning of line when WITH-BOL is non-nil." (and (not (bobp)) (save-excursion (forward-line n) - (skip-chars-forward "[ \t]") + (skip-chars-forward " \t") (eolp)))) (defun org-previous-line-empty-p () diff --git a/lisp/org.el b/lisp/org.el index ab676e623..ff5b63212 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -20749,7 +20749,7 @@ it has a `diary' type." (yank-media-handler "image/.*" #'org--image-yank-media-handler) ;; Looks like different DEs go for different handler names, ;; https://larsee.com/blog/2019/05/clipboard-files/. - (yank-media-handler "x/special-\\(?:gnome\|KDE\|mate\\)-files" + (yank-media-handler "x/special-\\(?:gnome\\|KDE\\|mate\\)-files" #'org--copied-files-yank-media-handler)) (when (boundp 'x-dnd-direct-save-function) (setq-local x-dnd-direct-save-function #'org--dnd-xds-function))) From 008e6030ac5309c71e15705957c049aa55324071 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 10 Jun 2024 10:58:46 -0400 Subject: [PATCH 3/3] Backport commit d3524560e from Emacs * lisp/ox.el (org-export-filters-alist): Don't define as constant. d3524560ee3cb075125f0af158d4af01cb2ab546 Stefan Monnier Mon Jun 10 10:58:46 2024 -0400 --- lisp/ox.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ox.el b/lisp/ox.el index b28fe2179..1c52ca290 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -185,7 +185,7 @@ All these properties should be backend agnostic. Backend specific properties are set through `org-export-define-backend'. Properties redefined there have precedence over these.") -(defconst org-export-filters-alist +(defvar org-export-filters-alist '((:filter-body . org-export-filter-body-functions) (:filter-bold . org-export-filter-bold-functions) (:filter-babel-call . org-export-filter-babel-call-functions)