Update to Org 9.6.13
This commit is contained in:
parent
2773cf9e01
commit
23c06c7c30
8 changed files with 36 additions and 18 deletions
|
@ -1,5 +1,5 @@
|
|||
% Reference Card for Org Mode
|
||||
\def\orgversionnumber{9.6.11}
|
||||
\def\orgversionnumber{9.6.13}
|
||||
\def\versionyear{2023} % latest update
|
||||
\input emacsver.tex
|
||||
|
||||
|
|
|
@ -57,7 +57,7 @@ The JAR can be configured via `org-plantuml-jar-path'.
|
|||
|
||||
`plantuml' means to use the PlantUML executable.
|
||||
The executable can be configured via `org-plantuml-executable-path'.
|
||||
You can also configure extra arguments via `org-plantuml-executable-args'."
|
||||
You can also configure extra arguments via `org-plantuml-args'."
|
||||
:group 'org-babel
|
||||
:package-version '(Org . "9.4")
|
||||
:type 'symbol
|
||||
|
|
|
@ -5906,7 +5906,7 @@ If this warning appears regularly, please report the warning text to Org mode ma
|
|||
(org-element-property :begin element)
|
||||
(org-element-property :org-element--cache-sync-key element))
|
||||
(org-element-cache-reset)
|
||||
(throw 'quit nil))
|
||||
(throw 'org-element--cache-quit nil))
|
||||
(or (avl-tree-delete org-element--cache element)
|
||||
(progn
|
||||
;; This should not happen, but if it is, would be better to know
|
||||
|
@ -5919,7 +5919,7 @@ If this warning appears regularly, please report the warning text to Org mode ma
|
|||
(org-element-property :begin element)
|
||||
(org-element-property :org-element--cache-sync-key element))
|
||||
(org-element-cache-reset)
|
||||
(throw 'quit nil)))))
|
||||
(throw 'org-element--cache-quit nil)))))
|
||||
|
||||
;;;; Synchronization
|
||||
|
||||
|
@ -6382,6 +6382,10 @@ completing the request."
|
|||
;; We altered the tree structure. The tree
|
||||
;; traversal needs to be restarted.
|
||||
(setf (org-element--request-key request) key)
|
||||
;; Make sure that we restart tree traversal
|
||||
;; past already shifted elements (before the
|
||||
;; removed DATA).
|
||||
(setq start key)
|
||||
(setf (org-element--request-parent request) parent)
|
||||
;; Restart tree traversal.
|
||||
(setq node (org-element--cache-root)
|
||||
|
|
|
@ -1119,7 +1119,12 @@ Return width in pixels when PIXELS is non-nil."
|
|||
(setq pixel-width
|
||||
(if (get-buffer-window (current-buffer))
|
||||
(car (window-text-pixel-size
|
||||
nil (line-beginning-position) (point-max)))
|
||||
;; FIXME: 10000 because
|
||||
;; `most-positive-fixnum' ain't working
|
||||
;; (tests failing) and this call will be
|
||||
;; removed after we drop Emacs 28 support
|
||||
;; anyway.
|
||||
nil (line-beginning-position) (point-max) 10000))
|
||||
(let ((dedicatedp (window-dedicated-p))
|
||||
(oldbuffer (window-buffer)))
|
||||
(unwind-protect
|
||||
|
@ -1128,7 +1133,7 @@ Return width in pixels when PIXELS is non-nil."
|
|||
(set-window-dedicated-p nil nil)
|
||||
(set-window-buffer nil (current-buffer))
|
||||
(car (window-text-pixel-size
|
||||
nil (line-beginning-position) (point-max))))
|
||||
nil (line-beginning-position) (point-max) 10000)))
|
||||
(set-window-buffer nil oldbuffer)
|
||||
(set-window-dedicated-p nil dedicatedp)))))
|
||||
(unless pixels
|
||||
|
@ -1137,7 +1142,7 @@ Return width in pixels when PIXELS is non-nil."
|
|||
(setq symbol-width
|
||||
(if (get-buffer-window (current-buffer))
|
||||
(car (window-text-pixel-size
|
||||
nil (line-beginning-position) (point-max)))
|
||||
nil (line-beginning-position) (point-max) 10000))
|
||||
(let ((dedicatedp (window-dedicated-p))
|
||||
(oldbuffer (window-buffer)))
|
||||
(unwind-protect
|
||||
|
@ -1146,7 +1151,7 @@ Return width in pixels when PIXELS is non-nil."
|
|||
(set-window-dedicated-p nil nil)
|
||||
(set-window-buffer nil (current-buffer))
|
||||
(car (window-text-pixel-size
|
||||
nil (line-beginning-position) (point-max))))
|
||||
nil (line-beginning-position) (point-max) 10000)))
|
||||
(set-window-buffer nil oldbuffer)
|
||||
(set-window-dedicated-p nil dedicatedp)))))))
|
||||
(if pixels
|
||||
|
|
|
@ -481,9 +481,14 @@ MISC, if non-nil will be appended to the collection. It must be a plist."
|
|||
(unless (stringp associated)
|
||||
(setq associated (cadr associated)))
|
||||
(let* ((rtn `(:file ,associated))
|
||||
(inode (and (fboundp 'file-attribute-inode-number)
|
||||
(file-attribute-inode-number
|
||||
(file-attributes associated)))))
|
||||
(inode (and
|
||||
;; Do not store :inode for remote files - it may
|
||||
;; be time-consuming on slow connections or even
|
||||
;; fail completely when ssh connection is closed.
|
||||
(not (file-remote-p associated))
|
||||
(fboundp 'file-attribute-inode-number)
|
||||
(file-attribute-inode-number
|
||||
(file-attributes associated)))))
|
||||
(when inode (plist-put rtn :inode inode))
|
||||
rtn))
|
||||
((or (pred bufferp) `(:buffer ,_))
|
||||
|
@ -501,6 +506,10 @@ MISC, if non-nil will be appended to the collection. It must be a plist."
|
|||
(or (buffer-base-buffer associated)
|
||||
associated)))
|
||||
(setq inode (when (and file
|
||||
;; Do not store :inode for remote files - it may
|
||||
;; be time-consuming on slow connections or even
|
||||
;; fail completely when ssh connection is closed.
|
||||
(not (file-remote-p file))
|
||||
(fboundp 'file-attribute-inode-number))
|
||||
(file-attribute-inode-number
|
||||
(file-attributes file))))
|
||||
|
|
|
@ -5,13 +5,13 @@
|
|||
(defun org-release ()
|
||||
"The release version of Org.
|
||||
Inserted by installing Org mode or when a release is made."
|
||||
(let ((org-release "9.6.11"))
|
||||
(let ((org-release "9.6.13"))
|
||||
org-release))
|
||||
;;;###autoload
|
||||
(defun org-git-version ()
|
||||
"The Git version of Org mode.
|
||||
Inserted by installing Org or when a release is made."
|
||||
(let ((org-git-version "release_9.6.11"))
|
||||
(let ((org-git-version "release_9.6.13"))
|
||||
org-git-version))
|
||||
|
||||
(provide 'org-version)
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
;; URL: https://orgmode.org
|
||||
;; Package-Requires: ((emacs "26.1"))
|
||||
|
||||
;; Version: 9.6.11
|
||||
;; Version: 9.6.13
|
||||
|
||||
;; This file is part of GNU Emacs.
|
||||
;;
|
||||
|
@ -19986,7 +19986,7 @@ With argument N not nil or 1, move forward N - 1 lines first."
|
|||
(if (eq special 'reversed)
|
||||
(when (and (= origin bol) (eq last-command this-command))
|
||||
(goto-char refpos))
|
||||
(when (or (> origin refpos) (= origin bol))
|
||||
(when (or (> origin refpos) (<= origin bol))
|
||||
(goto-char refpos)))))
|
||||
((and (looking-at org-list-full-item-re)
|
||||
(memq (org-element-type (save-match-data (org-element-at-point)))
|
||||
|
@ -20001,7 +20001,7 @@ With argument N not nil or 1, move forward N - 1 lines first."
|
|||
(if (eq special 'reversed)
|
||||
(when (and (= (point) origin) (eq last-command this-command))
|
||||
(goto-char after-bullet))
|
||||
(when (or (> origin after-bullet) (= (point) origin))
|
||||
(when (or (> origin after-bullet) (>= (point) origin))
|
||||
(goto-char after-bullet)))))
|
||||
;; No special context. Point is already at beginning of line.
|
||||
(t nil))))
|
||||
|
@ -20056,7 +20056,7 @@ With argument N not nil or 1, move forward N - 1 lines first."
|
|||
(goto-char tags)
|
||||
(end-of-line)))
|
||||
(t
|
||||
(if (or (< origin tags) (= origin (line-end-position)))
|
||||
(if (or (< origin tags) (>= origin (line-end-position)))
|
||||
(goto-char tags)
|
||||
(end-of-line))))))
|
||||
((bound-and-true-p visual-line-mode)
|
||||
|
|
|
@ -930,7 +930,7 @@ holding export options."
|
|||
'((":\\(B_[a-z]+\\|BMCOL\\):" 1 'org-beamer-tag prepend))
|
||||
'prepend))
|
||||
|
||||
(defface org-beamer-tag '((t (:box (:line-width 1 :color grey40))))
|
||||
(defface org-beamer-tag '((t (:box (:line-width 1 :color "grey40"))))
|
||||
"The special face for beamer tags."
|
||||
:group 'org-export-beamer)
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue