mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-08-25 11:02:53 +00:00
Merge branch 'bugfix'
This commit is contained in:
commit
4b647e70e6
|
@ -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
|
||||
|
|
20
lisp/org.el
20
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))
|
||||
|
|
Loading…
Reference in a new issue