[PATCH] Remove diary-list-entries Emacs 21 compat code

[PATCH] Remove diary-list-entries Emacs 21 compat code

[Stefan Kangas]

[-- Attachment #1: Type: text/plain, Size: 61 bytes --]

Please find attached a small cleanup patch to org-agenda.el.

[-- Attachment #2: 0001-Remove-diary-list-entries-Emacs-21-compat-code.patch --]
[-- Type: text/x-diff, Size: 1077 bytes --]

From 16224c9730fe2403d280fc3390ed700ce39c00ae Mon Sep 17 00:00:00 2001
From: Stefan Kangas <stefan@marxist.se>
Date: Sat, 17 Apr 2021 01:45:31 +0200
Subject: [PATCH] Remove diary-list-entries Emacs 21 compat code

* lisp/org-agenda.el (org-get-entries-from-diary): Remove some
Emacs 21 compat code; 'list-diary-entries' was made obsolete in
favour of 'diary-list-entries' in 22.1 and removed in 24.1.
---
 lisp/org-agenda.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index f22e6fa65..5368f5839 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -5255,9 +5255,7 @@ of what a project is and how to check if it stuck, customize the variable
 	 (org-disable-agenda-to-diary t))
     (save-excursion
       (save-window-excursion
-	(funcall (if (fboundp 'diary-list-entries)
-		     'diary-list-entries 'list-diary-entries)
-		 date 1)))
+        (diary-list-entries date 1)))
     (if (not (get-buffer diary-fancy-buffer))
 	(setq entries nil)
       (with-current-buffer diary-fancy-buffer
-- 
2.30.2

Re: [PATCH] Remove diary-list-entries Emacs 21 compat code

[Kyle Meyer]

Stefan Kangas writes:

> Please find attached a small cleanup patch to org-agenda.el.

Thanks.  Pushed (3a7e1c047).