[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 eedd9db6190: Update to Org 9.6.10
From: |
Kyle Meyer |
Subject: |
emacs-29 eedd9db6190: Update to Org 9.6.10 |
Date: |
Mon, 9 Oct 2023 23:59:12 -0400 (EDT) |
branch: emacs-29
commit eedd9db6190a7f69403aefe8098a554ef2b51371
Author: Kyle Meyer <kyle@kyleam.com>
Commit: Kyle Meyer <kyle@kyleam.com>
Update to Org 9.6.10
---
etc/refcards/orgcard.tex | 2 +-
lisp/org/org-agenda.el | 3 ++-
lisp/org/org-colview.el | 3 ++-
lisp/org/org-version.el | 4 ++--
lisp/org/org.el | 2 +-
5 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 62ba687c19f..240e3366b0b 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
% Reference Card for Org Mode
-\def\orgversionnumber{9.6.9}
+\def\orgversionnumber{9.6.10}
\def\versionyear{2023} % latest update
\input emacsver.tex
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index d3e61643190..38e81d9d713 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -6784,7 +6784,8 @@ scheduled items with an hour specification like [h]h:mm."
(let ((deadline (time-to-days
(when (org-element-property
:deadline el)
(org-time-string-to-time
- (org-element-property :deadline
el))))))
+ (org-element-interpret-data
+ (org-element-property :deadline
el)))))))
(and (<= schedule deadline) (> current deadline))))
(`not-today pastschedp)
(`t t)
diff --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el
index 28cfd0d910c..475416ecf74 100644
--- a/lisp/org/org-colview.el
+++ b/lisp/org/org-colview.el
@@ -525,7 +525,8 @@ for the duration of the command.")
(setq header-line-format org-previous-header-line-format)
(kill-local-variable 'org-previous-header-line-format)
(remove-hook 'post-command-hook #'org-columns-hscroll-title 'local))
- (set-marker org-columns-begin-marker nil)
+ (when (markerp org-columns-begin-marker)
+ (set-marker org-columns-begin-marker nil))
(when (markerp org-columns-top-level-marker)
(set-marker org-columns-top-level-marker nil))
(with-silent-modifications
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index a859fe6d412..cfef38581c6 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -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.9"))
+ (let ((org-release "9.6.10"))
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.9"))
+ (let ((org-git-version "release_9.6.10"))
org-git-version))
(provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index f97b9b6c753..0ba0cef4490 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9,7 +9,7 @@
;; URL: https://orgmode.org
;; Package-Requires: ((emacs "26.1"))
-;; Version: 9.6.9
+;; Version: 9.6.10
;; This file is part of GNU Emacs.
;;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-29 eedd9db6190: Update to Org 9.6.10,
Kyle Meyer <=