mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Update to Org 9.7.8-5-gfdf0e0

Browse source
This commit is contained in:
Kyle Meyer 2024-07-21 23:01:45 -04:00
parent 87f41b937b
commit 46b192c04b
3 changed files with 14 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
etc/refcards/orgcard.tex
View file

@ -1,5 +1,5 @@
% Reference Card for Org Mode % Reference Card for Org Mode
\def\orgversionnumber{9.7.7} \def\orgversionnumber{9.7.8}
\def\versionyear{2024} % latest update \def\versionyear{2024} % latest update
\input emacsver.tex \input emacsver.tex

4
lisp/org/org-version.el
View file

@ -5,13 +5,13 @@
(defun org-release () (defun org-release ()
"The release version of Org. "The release version of Org.
Inserted by installing Org mode or when a release is made." Inserted by installing Org mode or when a release is made."
(let ((org-release "9.7.7")) (let ((org-release "9.7.8"))
org-release)) org-release))
;;;###autoload ;;;###autoload
(defun org-git-version () (defun org-git-version ()
"The Git version of Org mode. "The Git version of Org mode.
Inserted by installing Org or when a release is made." Inserted by installing Org or when a release is made."
(let ((org-git-version "release_9.7.7-2-gf308d3")) (let ((org-git-version "release_9.7.8-5-gfdf0e0"))
org-git-version)) org-git-version))
(provide 'org-version) (provide 'org-version)

21
lisp/org/org.el
View file

@ -9,7 +9,7 @@
;; URL: https://orgmode.org ;; URL: https://orgmode.org
;; Package-Requires: ((emacs "26.1")) ;; Package-Requires: ((emacs "26.1"))
;; Version: 9.7.7 ;; Version: 9.7.8
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
;; ;;
@ -19620,7 +19620,7 @@ ELEMENT."
(if level (1+ level) 0)))) (if level (1+ level) 0))))
((item plain-list) (org-list-item-body-column post-affiliated)) ((item plain-list) (org-list-item-body-column post-affiliated))
(t (t
(goto-char start) (when start (goto-char start))
(current-indentation)))) (current-indentation))))
((memq type '(headline inlinetask nil)) ((memq type '(headline inlinetask nil))
(if (org-match-line "[ \t]*$") (if (org-match-line "[ \t]*$")
@ -19629,14 +19629,14 @@ ELEMENT."
((memq type '(diary-sexp footnote-definition)) 0) ((memq type '(diary-sexp footnote-definition)) 0)
;; First paragraph of a footnote definition or an item. ;; First paragraph of a footnote definition or an item.
;; Indent like parent. ;; Indent like parent.
((< (line-beginning-position) start) ((and start (< (line-beginning-position) start))
(org--get-expected-indentation (org--get-expected-indentation
(org-element-parent element) t)) (org-element-parent element) t))
;; At first line: indent according to previous sibling, if any, ;; At first line: indent according to previous sibling, if any,
;; ignoring footnote definitions and inline tasks, or parent's ;; ignoring footnote definitions and inline tasks, or parent's
;; contents. If `org-adapt-indentation' is `headline-data', ignore ;; contents. If `org-adapt-indentation' is `headline-data', ignore
;; previous headline data siblings. ;; previous headline data siblings.
((= (line-beginning-position) start) ((and start (= (line-beginning-position) start))
(catch 'exit (catch 'exit
(while t (while t
(if (= (point-min) start) (throw 'exit 0) (if (= (point-min) start) (throw 'exit 0)
@ -19686,13 +19686,13 @@ ELEMENT."
;; Line above is the first one of a paragraph at the ;; Line above is the first one of a paragraph at the
;; beginning of an item or a footnote definition. Indent ;; beginning of an item or a footnote definition. Indent
;; like parent. ;; like parent.
((< (line-beginning-position) start) ((and start (< (line-beginning-position) start))
(org--get-expected-indentation (org--get-expected-indentation
(org-element-parent element) t)) (org-element-parent element) t))
;; Line above is the beginning of an element, i.e., point ;; Line above is the beginning of an element, i.e., point
;; was originally on the blank lines between element's start ;; was originally on the blank lines between element's start
;; and contents. ;; and contents.
((= (line-beginning-position) post-affiliated) ((and post-affiliated (= (line-beginning-position) post-affiliated))
(org--get-expected-indentation element t)) (org--get-expected-indentation element t))
;; POS is after contents in a greater element. Indent like ;; POS is after contents in a greater element. Indent like
;; the beginning of the element. ;; the beginning of the element.
@ -19780,10 +19780,11 @@ Also align node properties according to `org-property-format'."
(not (org--at-headline-data-p nil element)) (not (org--at-headline-data-p nil element))
;; Not at headline data and previous is headline data/headline. ;; Not at headline data and previous is headline data/headline.
(or (memq type '(headline inlinetask)) ; blank lines after heading (or (memq type '(headline inlinetask)) ; blank lines after heading
(save-excursion (and element
(goto-char (1- (org-element-begin element))) (save-excursion
(or (org-at-heading-p) (goto-char (1- (org-element-begin element)))
(org--at-headline-data-p)))))) (or (org-at-heading-p)
(org--at-headline-data-p)))))))
(cond ((and (memq type '(plain-list item)) (cond ((and (memq type '(plain-list item))
(= (line-beginning-position) (= (line-beginning-position)
(org-element-post-affiliated element))) (org-element-post-affiliated element)))