mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-21 06:55:35 +00:00
Code

Merge branch 'bugfix'

Browse Source
This commit is contained in:
Ihor Radchenko 2024-10-07 20:41:47 +02:00
commit f14ed5791f
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org-persist.el
View File

@ -1025,10 +1025,6 @@ the CONTAINER as well."
(remove container (plist-get collection :container))) (remove container (plist-get collection :container)))
(org-persist--add-to-index collection)))))) (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) (cl-defun org-persist-read (container &optional associated hash-must-match load &key read-related)
"Restore CONTAINER data for ASSOCIATED. "Restore CONTAINER data for ASSOCIATED.
When HASH-MUST-MATCH is non-nil, do not restore data if hash for When HASH-MUST-MATCH is non-nil, do not restore data if hash for
@ -1076,8 +1072,7 @@ CONTAINER as well. For example:
(unless (seq-find (lambda (v) (unless (seq-find (lambda (v)
(run-hook-with-args-until-success 'org-persist-before-read-hook v associated)) (run-hook-with-args-until-success 'org-persist-before-read-hook v associated))
(plist-get collection :container)) (plist-get collection :container))
(setq data (or (gethash persist-file org-persist--write-cache) (setq data (org-persist--read-elisp-file persist-file))
(org-persist--read-elisp-file persist-file)))
(when data (when data
(cl-loop for c in (plist-get collection :container) (cl-loop for c in (plist-get collection :container)
with result = nil with result = nil
@ -1148,7 +1143,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))) (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))) (data (mapcar (lambda (c) (cons c (org-persist-write:generic c collection)))
(plist-get collection :container)))) (plist-get collection :container))))
(puthash file data org-persist--write-cache)
(org-persist--write-elisp-file file data) (org-persist--write-elisp-file file data)
(or ignore-return (org-persist-read container associated))))))) (or ignore-return (org-persist-read container associated)))))))

6
lisp/ox.el
View File

@ -6188,6 +6188,7 @@ them."
("tr" :default "Devamı sonraki sayfada")) ("tr" :default "Devamı sonraki sayfada"))
("Created" ("Created"
("cs" :default "Vytvořeno") ("cs" :default "Vytvořeno")
("de" :default "Erstellt am")
("et" :default "Loodud") ("et" :default "Loodud")
("fa" :default "ساخته شده") ("fa" :default "ساخته شده")
("nl" :default "Gemaakt op") ;; must be followed by a date or date+time ("nl" :default "Gemaakt op") ;; must be followed by a date or date+time
@ -6443,6 +6444,7 @@ them."
("See figure %s" ("See figure %s"
("cs" :default "Viz obrázek %s") ("cs" :default "Viz obrázek %s")
("et" :default "Vaata joonist %s") ("et" :default "Vaata joonist %s")
("de" :default "Siehe Abbildung %s")
("fa" :default "نمایش شکل %s") ("fa" :default "نمایش شکل %s")
("fr" :default "cf. figure %s" ("fr" :default "cf. figure %s"
:html "cf. figure %s" :latex "cf.~figure~%s") :html "cf. figure %s" :latex "cf.~figure~%s")
@ -6459,6 +6461,7 @@ them."
("See listing %s" ("See listing %s"
("cs" :default "Viz program %s") ("cs" :default "Viz program %s")
("et" :default "Vaata loendit %s") ("et" :default "Vaata loendit %s")
("de" :default "Siehe Programmlisting %s")
("fa" :default "نمایش برنامه‌ریزی %s") ("fa" :default "نمایش برنامه‌ریزی %s")
("fr" :default "cf. programme %s" ("fr" :default "cf. programme %s"
:html "cf. programme %s" :latex "cf.~programme~%s") :html "cf. programme %s" :latex "cf.~programme~%s")
@ -6475,7 +6478,7 @@ them."
("ar" :default "انظر قسم %s") ("ar" :default "انظر قسم %s")
("cs" :default "Viz sekce %s") ("cs" :default "Viz sekce %s")
("da" :default "jævnfør afsnit %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") ("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") ("et" :default "Vaata peatükki %s" :html "Vaata peatükki %s" :utf-8 "Vaata peatükki %s")
("fa" :default "نمایش بخش %s") ("fa" :default "نمایش بخش %s")
@ -6498,6 +6501,7 @@ them."
("See table %s" ("See table %s"
("cs" :default "Viz tabulka %s") ("cs" :default "Viz tabulka %s")
("et" :default "Vaata tabelit %s") ("et" :default "Vaata tabelit %s")
("de" :default "Siehe Tabelle %s")
("fa" :default "نمایش جدول %s") ("fa" :default "نمایش جدول %s")
("fr" :default "cf. tableau %s" ("fr" :default "cf. tableau %s"
:html "cf. tableau %s" :latex "cf.~tableau~%s") :html "cf. tableau %s" :latex "cf.~tableau~%s")