Skip to content

Commit 46b192c

Browse files
committed
Update to Org 9.7.8-5-gfdf0e0
1 parent 87f41b9 commit 46b192c

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

etc/refcards/orgcard.tex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
% Reference Card for Org Mode
2-
\def\orgversionnumber{9.7.7}
2+
\def\orgversionnumber{9.7.8}
33
\def\versionyear{2024} % latest update
44
\input emacsver.tex
55

lisp/org/org-version.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
(defun org-release ()
66
"The release version of Org.
77
Inserted by installing Org mode or when a release is made."
8-
(let ((org-release "9.7.7"))
8+
(let ((org-release "9.7.8"))
99
org-release))
1010
;;;###autoload
1111
(defun org-git-version ()
1212
"The Git version of Org mode.
1313
Inserted by installing Org or when a release is made."
14-
(let ((org-git-version "release_9.7.7-2-gf308d3"))
14+
(let ((org-git-version "release_9.7.8-5-gfdf0e0"))
1515
org-git-version))
1616

1717
(provide 'org-version)

lisp/org/org.el

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
;; URL: https://orgmode.org
1010
;; Package-Requires: ((emacs "26.1"))
1111

12-
;; Version: 9.7.7
12+
;; Version: 9.7.8
1313

1414
;; This file is part of GNU Emacs.
1515
;;
@@ -19620,7 +19620,7 @@ ELEMENT."
1962019620
(if level (1+ level) 0))))
1962119621
((item plain-list) (org-list-item-body-column post-affiliated))
1962219622
(t
19623-
(goto-char start)
19623+
(when start (goto-char start))
1962419624
(current-indentation))))
1962519625
((memq type '(headline inlinetask nil))
1962619626
(if (org-match-line "[ \t]*$")
@@ -19629,14 +19629,14 @@ ELEMENT."
1962919629
((memq type '(diary-sexp footnote-definition)) 0)
1963019630
;; First paragraph of a footnote definition or an item.
1963119631
;; Indent like parent.
19632-
((< (line-beginning-position) start)
19632+
((and start (< (line-beginning-position) start))
1963319633
(org--get-expected-indentation
1963419634
(org-element-parent element) t))
1963519635
;; At first line: indent according to previous sibling, if any,
1963619636
;; ignoring footnote definitions and inline tasks, or parent's
1963719637
;; contents. If `org-adapt-indentation' is `headline-data', ignore
1963819638
;; previous headline data siblings.
19639-
((= (line-beginning-position) start)
19639+
((and start (= (line-beginning-position) start))
1964019640
(catch 'exit
1964119641
(while t
1964219642
(if (= (point-min) start) (throw 'exit 0)
@@ -19686,13 +19686,13 @@ ELEMENT."
1968619686
;; Line above is the first one of a paragraph at the
1968719687
;; beginning of an item or a footnote definition. Indent
1968819688
;; like parent.
19689-
((< (line-beginning-position) start)
19689+
((and start (< (line-beginning-position) start))
1969019690
(org--get-expected-indentation
1969119691
(org-element-parent element) t))
1969219692
;; Line above is the beginning of an element, i.e., point
1969319693
;; was originally on the blank lines between element's start
1969419694
;; and contents.
19695-
((= (line-beginning-position) post-affiliated)
19695+
((and post-affiliated (= (line-beginning-position) post-affiliated))
1969619696
(org--get-expected-indentation element t))
1969719697
;; POS is after contents in a greater element. Indent like
1969819698
;; the beginning of the element.
@@ -19780,10 +19780,11 @@ Also align node properties according to `org-property-format'."
1978019780
(not (org--at-headline-data-p nil element))
1978119781
;; Not at headline data and previous is headline data/headline.
1978219782
(or (memq type '(headline inlinetask)) ; blank lines after heading
19783-
(save-excursion
19784-
(goto-char (1- (org-element-begin element)))
19785-
(or (org-at-heading-p)
19786-
(org--at-headline-data-p))))))
19783+
(and element
19784+
(save-excursion
19785+
(goto-char (1- (org-element-begin element)))
19786+
(or (org-at-heading-p)
19787+
(org--at-headline-data-p)))))))
1978719788
(cond ((and (memq type '(plain-list item))
1978819789
(= (line-beginning-position)
1978919790
(org-element-post-affiliated element)))

0 commit comments

Comments
 (0)