[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/org 4ae72c6174 19/50: Backport commit 0f7ceb480 from Em
From: |
ELPA Syncer |
Subject: |
[elpa] externals/org 4ae72c6174 19/50: Backport commit 0f7ceb480 from Emacs |
Date: |
Tue, 4 Oct 2022 21:57:59 -0400 (EDT) |
branch: externals/org
commit 4ae72c61749b6661d3d401cd5a181e5df6a5cc07
Author: Ihor Radchenko <yantar92@gmail.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Backport commit 0f7ceb480 from Emacs
* lisp/ox.el (org-export-as): Use `buffer-chars-modified-tick' and
avoid extra invocations of `org-set-regexps-and-options' and
`org-update-radio-target-regexp' when the buffer is not changed.
Also, disable folding checks. Folding is irrelevant inside export
buffer.
org-export-as: Do not update buffer settings when not modified
0f7ceb4803cabcb3c406fa7c27ccb7625096058e
Ihor Radchenko
Thu Jun 16 10:53:16 2022 +0300
[ km: This ported commit comes from main's 076dd92ac. I'm applying it
here too for bookkeeping/traceability purposes. ]
---
lisp/ox.el | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/lisp/ox.el b/lisp/ox.el
index 0b4ae1dc09..91a0df1855 100644
--- a/lisp/ox.el
+++ b/lisp/ox.el
@@ -2958,11 +2958,12 @@ Return code as a string."
(mapcar (lambda (o) (and (eq (nth 4 o) 'parse) (nth 1 o)))
(append (org-export-get-all-options backend)
org-export-options-alist))))
- tree)
+ tree modified-tick)
;; Update communication channel and get parse tree. Buffer
;; isn't parsed directly. Instead, all buffer modifications
;; and consequent parsing are undertaken in a temporary copy.
(org-export-with-buffer-copy
+ (font-lock-mode -1)
;; Run first hook with current back-end's name as argument.
(run-hook-with-args 'org-export-before-processing-hook
(org-export-backend-name backend))
@@ -2974,6 +2975,7 @@ Return code as a string."
;; potentially invasive changes.
(org-set-regexps-and-options)
(org-update-radio-target-regexp)
+ (setq modified-tick (buffer-chars-modified-tick))
;; Possibly execute Babel code. Re-run a macro expansion
;; specifically for {{{results}}} since inline source blocks
;; may have generated some more. Refresh buffer properties
@@ -2981,8 +2983,10 @@ Return code as a string."
(when org-export-use-babel
(org-babel-exp-process-buffer)
(org-macro-replace-all '(("results" . "$1")) parsed-keywords)
- (org-set-regexps-and-options)
- (org-update-radio-target-regexp))
+ (unless (eq modified-tick (buffer-chars-modified-tick))
+ (org-set-regexps-and-options)
+ (org-update-radio-target-regexp))
+ (setq modified-tick (buffer-chars-modified-tick)))
;; Run last hook with current back-end's name as argument.
;; Update buffer properties and radio targets one last time
;; before parsing.
@@ -2990,8 +2994,10 @@ Return code as a string."
(save-excursion
(run-hook-with-args 'org-export-before-parsing-hook
(org-export-backend-name backend)))
- (org-set-regexps-and-options)
- (org-update-radio-target-regexp)
+ (unless (eq modified-tick (buffer-chars-modified-tick))
+ (org-set-regexps-and-options)
+ (org-update-radio-target-regexp))
+ (setq modified-tick (buffer-chars-modified-tick))
;; Update communication channel with environment.
(setq info
(org-combine-plists
- [elpa] externals/org e58217ff1f 35/50: Backport commit 57259773b from Emacs, (continued)
- [elpa] externals/org e58217ff1f 35/50: Backport commit 57259773b from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 772c44779c 06/50: Backport commit dd0727e1e from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 5d5a7832ec 09/50: Backport commit 18b680cfd from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 303c89350e 16/50: Backport commit 5b3d4e7bf from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 675ec6771f 23/50: Backport commit 9230953f2 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 1bbd86310a 31/50: Backport commit 4c1bc8315 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org add8552b1d 36/50: Backport commit 48aacbf29 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 98e168b489 46/50: compat: Add compatibility wrapper for string-clean-whitespace, ELPA Syncer, 2022/10/04
- [elpa] externals/org 75d63533d3 47/50: compat: Move string-equal-ignore-case to correct section, ELPA Syncer, 2022/10/04
- [elpa] externals/org 95a4c59bfe 49/50: compat: Add compatibility wrapper for format-prompt, ELPA Syncer, 2022/10/04
- [elpa] externals/org 4ae72c6174 19/50: Backport commit 0f7ceb480 from Emacs,
ELPA Syncer <=
- [elpa] externals/org 0da6c49f75 21/50: Backport commit 4f37a3b29 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 07ca33e603 25/50: Backport commit 2a05479c2 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org e7059f7dbe 28/50: Backport commit 22a5f0223 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org e9df837d8a 30/50: Backport commit 0a6e2b3bf from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 883f87c3e7 32/50: Backport commit 4d64c39fa from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 2ac8c44f04 33/50: Backport commit b335e1a04 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 631d4eb6af 40/50: org-macs: Move org-current-text-indentation to silence byte-compiler, ELPA Syncer, 2022/10/04
- [elpa] externals/org 07c5d066aa 17/50: Backport commit 3236dedc2 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 9b62bcc9c6 39/50: Backport commit 8dacd8cd9 from Emacs, ELPA Syncer, 2022/10/04
- [elpa] externals/org 0e0fe76ae4 45/50: ox-icalendar: Fix time zone construct from recently ported commit, ELPA Syncer, 2022/10/04