branch: externals/org
commit 4b647e70e6a863ec9e8b0f56faea2f00365d55ca
Merge: 96a402780c 1cd39c9e30
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
Merge branch 'bugfix'
---
lisp/org-macs.el | 4 ++--
lisp/org.el | 20 ++++++++++++--------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/lisp/org-macs.el b/lisp/org-macs.el
index bdfca12927..72929cdd26 100644
--- a/lisp/org-macs.el
+++ b/lisp/org-macs.el
@@ -74,9 +74,9 @@ Version mismatch is commonly encountered in the following
situations:
loading of the newer Org version.
It is recommended to put
-
+
%s
-
+
early in the config. Ideally, right after the straight.el
bootstrap. Moving `use-package' :straight declaration may not be
sufficient if the corresponding `use-package' statement is
diff --git a/lisp/org.el b/lisp/org.el
index a98a7f5a0c..c6babc6392 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -4900,16 +4900,20 @@ The following commands are available:
(= (point-min) (point-max)))
(insert "# -*- mode: org -*-\n\n"))
(unless org-inhibit-startup
+ (when (or org-startup-align-all-tables org-startup-shrink-all-tables)
+ (org-table-map-tables
+ (cond ((and org-startup-align-all-tables
+ org-startup-shrink-all-tables)
+ (lambda () (org-table-align) (org-table-shrink)))
+ (org-startup-align-all-tables #'org-table-align)
+ (t #'org-table-shrink))
+ t))
+ ;; Suppress modification hooks to speed up the startup.
+ ;; However, do it only when text properties/overlays, but not
+ ;; buffer text are actually modified. We still need to track text
+ ;; modifications to make cache updates work reliably.
(org-unmodified
(when org-startup-with-beamer-mode (org-beamer-mode))
- (when (or org-startup-align-all-tables org-startup-shrink-all-tables)
- (org-table-map-tables
- (cond ((and org-startup-align-all-tables
- org-startup-shrink-all-tables)
- (lambda () (org-table-align) (org-table-shrink)))
- (org-startup-align-all-tables #'org-table-align)
- (t #'org-table-shrink))
- t))
(when org-startup-with-inline-images (org-display-inline-images))
(when org-startup-with-latex-preview (org-latex-preview '(16)))
(unless org-inhibit-startup-visibility-stuff
(org-cycle-set-startup-visibility))
