From 269dce9fe7e548af8e38d2c47684b15b840bf06a Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Dec 2022 16:15:16 -0500 Subject: [PATCH 1/3] org-table: Require org-fold-core * lisp/org-table.el: Explicitly load org-fold-core. 'make single' warns that org-fold-core-ignore-modifications in org-table.el (introduced a few commits back) is not known to be defined, and the Emacs repo would show the same warning. --- lisp/org-table.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org-table.el b/lisp/org-table.el index 7d02d896f..fa9a0319b 100644 --- a/lisp/org-table.el +++ b/lisp/org-table.el @@ -41,6 +41,7 @@ (require 'org-macs) (require 'org-compat) (require 'org-keys) +(require 'org-fold-core) (declare-function calc-eval "calc" (str &optional separator &rest args)) (declare-function face-remap-remove-relative "face-remap" (cookie)) From 954a95ec5f74c68fe045101e303197297ac5725b Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 10 Dec 2022 16:52:42 -0500 Subject: [PATCH 2/3] ob-core: Revert space misalignment from recent commit cc5427b7e (org-babel-result-to-file: Fix results file inside attachment dir, 2022-12-07) carried along an unrelated white space change upstream of the main change. --- lisp/ob-core.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lisp/ob-core.el b/lisp/ob-core.el index 069fc442f..f69538f78 100644 --- a/lisp/ob-core.el +++ b/lisp/ob-core.el @@ -2692,8 +2692,8 @@ specified as an an \"attachment:\" style link." (same-directory? (and base-file-name (not (string= (expand-file-name default-directory) - (expand-file-name - base-directory))))) + (expand-file-name + base-directory))))) (request-attachment (eq type 'attachment)) (attach-dir (let* ((default-directory base-directory) (dir (org-attach-dir nil t))) From 41a8666c09c702cb851b79a6f5eb3b3f0ba3e52b Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Sun, 11 Dec 2022 12:13:44 +0300 Subject: [PATCH 3/3] org-display-inline-remove-overlay: Do better job clearing images from cache * lisp/org.el (org-display-inline-remove-overlay): Force remove overlay images from Emacs image cache when un-displaying inline image overlays. This change should: (1) slightly improve Emacs memory usage when the number of inline images is large; (2) Clear images from cache every time Emacs removes the overlay for any reason. (`org-display-inline-remove-overlay' is used in overlay 'modification-hooks.) --- lisp/org.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lisp/org.el b/lisp/org.el index 19f94c5e2..3018e4d6f 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -16399,6 +16399,10 @@ buffer boundaries with possible narrowing." "Remove inline-display overlay if a corresponding region is modified." (when (and ov after) (delete ov org-inline-image-overlays) + ;; Clear image from cache to avoid image not updating upon + ;; changing on disk. See Emacs bug#59902. + (when (overlay-get ov 'org-image-overlay) + (image-flush (overlay-get ov 'display))) (delete-overlay ov))) (defun org-remove-inline-images (&optional beg end)