emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Stefan Kangas <stefan@marxist.se>
To: emacs-orgmode@gnu.org
Subject: [PATCH] Remove diary-list-entries Emacs 21 compat code
Date: Fri, 16 Apr 2021 19:00:28 -0500	[thread overview]
Message-ID: <CADwFkmmHjk52X6eapfZ_rdJu-jY52cWcmeRexL=DUy9cQgPhpg@mail.gmail.com> (raw)

[-- 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


             reply	other threads:[~2021-04-17  0:09 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-17  0:00 Stefan Kangas [this message]
2021-04-17 19:21 ` Kyle Meyer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CADwFkmmHjk52X6eapfZ_rdJu-jY52cWcmeRexL=DUy9cQgPhpg@mail.gmail.com' \
    --to=stefan@marxist.se \
    --cc=emacs-orgmode@gnu.org \
    --subject='Re: [PATCH] Remove diary-list-entries Emacs 21 compat code' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).