ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix'

This commit is contained in:
Ihor Radchenko 2023-01-02 10:27:44 +03:00
parent 96a402780c 1cd39c9e30
commit 4b647e70e6
No known key found for this signature in database
GPG Key ID: 6470762A7DA11D8B
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/org-macs.el
View File

@ -74,9 +74,9 @@ Version mismatch is commonly encountered in the following situations:
loading of the newer Org version. loading of the newer Org version.
It is recommended to put It is recommended to put
%s %s
early in the config. Ideally, right after the straight.el early in the config. Ideally, right after the straight.el
bootstrap. Moving `use-package' :straight declaration may not be bootstrap. Moving `use-package' :straight declaration may not be
sufficient if the corresponding `use-package' statement is sufficient if the corresponding `use-package' statement is

20
lisp/org.el
View File

@ -4900,16 +4900,20 @@ The following commands are available:
(= (point-min) (point-max))) (= (point-min) (point-max)))
(insert "# -*- mode: org -*-\n\n")) (insert "# -*- mode: org -*-\n\n"))
(unless org-inhibit-startup (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 (org-unmodified
(when org-startup-with-beamer-mode (org-beamer-mode)) (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-inline-images (org-display-inline-images))
(when org-startup-with-latex-preview (org-latex-preview '(16))) (when org-startup-with-latex-preview (org-latex-preview '(16)))
(unless org-inhibit-startup-visibility-stuff (org-cycle-set-startup-visibility)) (unless org-inhibit-startup-visibility-stuff (org-cycle-set-startup-visibility))