From 61f37f2e1afc78ce4078dcfe1293205ad2827430 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 12 Dec 2020 14:34:08 -0500 Subject: [PATCH 1/3] lisp/org.el: Bump version to 9.4.1 * lisp/org.el: Bump version to 9.4.1. --- lisp/org.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index b09855060..3db07cd89 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -8,7 +8,7 @@ ;; Keywords: outlines, hypermedia, calendar, wp ;; Homepage: https://orgmode.org -;; Version: 9.4 +;; Version: 9.4.1 ;; This file is part of GNU Emacs. ;; From 5dc375434ccc5f4b793148c686cc194b40622275 Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 12 Dec 2020 14:41:42 -0500 Subject: [PATCH 2/3] Clean up spacing to pass Emacs's pre-commit check * lisp/org-agenda.el (org-agenda-todo): Avoid space before tab in indent. This is in preparation for syncing with the Emacs repo. --- lisp/org-agenda.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index a482b3db4..83f30bf96 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -9342,7 +9342,7 @@ the same tree node, and the headline of the tree node in the Org file." (save-window-excursion (org-agenda-change-all-lines newhead hdmarker 'fixface just-one)) (when (bound-and-true-p org-clock-out-when-done) - (string-match (concat "^" (regexp-opt org-done-keywords-for-agenda)) + (string-match (concat "^" (regexp-opt org-done-keywords-for-agenda)) newhead) (org-agenda-unmark-clocking-task)) (org-move-to-column col) From 8fafb71fea8b579b95aabc01c2796af20606789f Mon Sep 17 00:00:00 2001 From: Kyle Meyer Date: Sat, 12 Dec 2020 23:17:30 -0500 Subject: [PATCH 3/3] org-startup-options: Fix docstring typo * lisp/org.el (org-startup-options): Fix docstring typo. --- lisp/org.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org.el b/lisp/org.el index 3db07cd89..2a63fe438 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -4179,7 +4179,7 @@ After a match, the following groups carry important information: "Variable associated with STARTUP options for Org. Each element is a list of three items: the startup options (as written in the #+STARTUP line), the corresponding variable, and the value to set -this variable to if the option is found. An optional forth element PUSH +this variable to if the option is found. An optional fourth element PUSH means to push this value onto the list in the variable.") (defcustom org-group-tags t