From 28c83e678f674aaadf1bcb068f72dcca0abcf14d Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Sun, 6 Oct 2024 09:30:35 +0200 Subject: [PATCH 1/4] Update version number for the 9.7.12 release --- lisp/org.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index 60c95a6ff..800f0f4ca 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -9,7 +9,7 @@ ;; URL: https://orgmode.org ;; Package-Requires: ((emacs "26.1")) -;; Version: 9.7.11 +;; Version: 9.7.12 ;; This file is part of GNU Emacs. ;; From 1a51e219794a90ea721ff7c94a55e532e932f288 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Sat, 5 Oct 2024 17:11:38 +0200 Subject: [PATCH 2/4] * lisp/org/ox.el (org-export-dictionary): Update German entries --- lisp/ox.el | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ox.el b/lisp/ox.el index 7cdf622ec..429c6e4da 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -6179,6 +6179,7 @@ them." ("tr" :default "Devamı sonraki sayfada")) ("Created" ("cs" :default "Vytvořeno") + ("de" :default "Erstellt am") ("et" :default "Loodud") ("fa" :default "ساخته شده") ("nl" :default "Gemaakt op") ;; must be followed by a date or date+time @@ -6434,6 +6435,7 @@ them." ("See figure %s" ("cs" :default "Viz obrázek %s") ("et" :default "Vaata joonist %s") + ("et" :default "Siehe Abbildung %s") ("fa" :default "نمایش شکل %s") ("fr" :default "cf. figure %s" :html "cf. figure %s" :latex "cf.~figure~%s") @@ -6450,6 +6452,7 @@ them." ("See listing %s" ("cs" :default "Viz program %s") ("et" :default "Vaata loendit %s") + ("de" :default "Siehe Programmlisting %s") ("fa" :default "نمایش برنامه‌ریزی %s") ("fr" :default "cf. programme %s" :html "cf. programme %s" :latex "cf.~programme~%s") @@ -6466,7 +6469,7 @@ them." ("ar" :default "انظر قسم %s") ("cs" :default "Viz sekce %s") ("da" :default "jævnfør afsnit %s") - ("de" :default "siehe Abschnitt %s") + ("de" :default "Siehe Abschnitt %s") ("es" :ascii "Vea seccion %s" :html "Vea sección %s" :default "Vea sección %s") ("et" :default "Vaata peatükki %s" :html "Vaata peatükki %s" :utf-8 "Vaata peatükki %s") ("fa" :default "نمایش بخش %s") @@ -6489,6 +6492,7 @@ them." ("See table %s" ("cs" :default "Viz tabulka %s") ("et" :default "Vaata tabelit %s") + ("de" :default "Siehe Tabelle %s") ("fa" :default "نمایش جدول %s") ("fr" :default "cf. tableau %s" :html "cf. tableau %s" :latex "cf.~tableau~%s") From d33940f6e20e5ee55942f98a6aa82a8b799115ad Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Mon, 7 Oct 2024 19:54:39 +0200 Subject: [PATCH 3/4] Fix typo in 1a51e21979 * lisp/ox.el (org-export-dictionary): Fix language id. Should be "de". TINYCHANGE --- lisp/ox.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/ox.el b/lisp/ox.el index 429c6e4da..6ad09b72d 100644 --- a/lisp/ox.el +++ b/lisp/ox.el @@ -6435,7 +6435,7 @@ them." ("See figure %s" ("cs" :default "Viz obrázek %s") ("et" :default "Vaata joonist %s") - ("et" :default "Siehe Abbildung %s") + ("de" :default "Siehe Abbildung %s") ("fa" :default "نمایش شکل %s") ("fr" :default "cf. figure %s" :html "cf. figure %s" :latex "cf.~figure~%s") From eb6d70f817df0e7ec47502543b737dffca505c1a Mon Sep 17 00:00:00 2001 From: Ihor Radchenko Date: Mon, 7 Oct 2024 20:35:12 +0200 Subject: [PATCH 4/4] org-persist: Fix cached data being modified by reference * lisp/org-persist.el (org-persist--write-cache): * lisp/org-persist.el (org-persist-read): (org-persist-write): Remove `org-persist--write-cache'. The values, after reading, might sometimes be modified in place. The modifications, when done inside some kind of deeply nested structure, will propagate to the cache, polluting what was originally written in the persist file. This was a difficult bug to spot - the modification hapenned when an Org buffer was saved to a different file (C-x C-w), modified, leading to `org-element--cache' modification, and then closed. This modification propagated to `org-persist--write-cache', leading to incorrect cache value being assigned to the original buffer (before C-x C-w). Reported-by: Gregor Zattler --- lisp/org-persist.el | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/lisp/org-persist.el b/lisp/org-persist.el index 7fa836d0d..eec905e74 100644 --- a/lisp/org-persist.el +++ b/lisp/org-persist.el @@ -1006,10 +1006,6 @@ the CONTAINER as well." (remove container (plist-get collection :container))) (org-persist--add-to-index collection)))))) -(defvar org-persist--write-cache (make-hash-table :test #'equal) - "Hash table storing as-written data objects. - -This data is used to avoid reading the data multiple times.") (cl-defun org-persist-read (container &optional associated hash-must-match load &key read-related) "Restore CONTAINER data for ASSOCIATED. When HASH-MUST-MATCH is non-nil, do not restore data if hash for @@ -1057,8 +1053,7 @@ CONTAINER as well. For example: (unless (seq-find (lambda (v) (run-hook-with-args-until-success 'org-persist-before-read-hook v associated)) (plist-get collection :container)) - (setq data (or (gethash persist-file org-persist--write-cache) - (org-persist--read-elisp-file persist-file))) + (setq data (org-persist--read-elisp-file persist-file)) (when data (cl-loop for c in (plist-get collection :container) with result = nil @@ -1129,7 +1124,6 @@ When IGNORE-RETURN is non-nil, just return t on success without calling (let ((file (org-file-name-concat org-persist-directory (plist-get collection :persist-file))) (data (mapcar (lambda (c) (cons c (org-persist-write:generic c collection))) (plist-get collection :container)))) - (puthash file data org-persist--write-cache) (org-persist--write-elisp-file file data) (or ignore-return (org-persist-read container associated)))))))