diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2023-10-09 23:47:52 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2023-10-09 23:47:52 -0400 |
| commit | eedd9db6190a7f69403aefe8098a554ef2b51371 (patch) | |
| tree | f3b166435ead6074f1d43cde1ce7a9d135006f7e /lisp/org | |
| parent | 73ccd9d2959aba36b2433c5c6d0a3bc81114e76d (diff) | |
| download | emacs-eedd9db6190a7f69403aefe8098a554ef2b51371.tar.gz emacs-eedd9db6190a7f69403aefe8098a554ef2b51371.tar.bz2 emacs-eedd9db6190a7f69403aefe8098a554ef2b51371.zip | |
Update to Org 9.6.10
Diffstat (limited to 'lisp/org')
| -rw-r--r-- | lisp/org/org-agenda.el | 3 | ||||
| -rw-r--r-- | lisp/org/org-colview.el | 3 | ||||
| -rw-r--r-- | lisp/org/org-version.el | 4 | ||||
| -rw-r--r-- | lisp/org/org.el | 2 |
4 files changed, 7 insertions, 5 deletions
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. ;; |