emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Marco Wahl <marcowahlsoft@gmail.com>
To: Maxim Nikulin <manikulin@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: org-attach-sync uses directory-empty-p (new in Emacs 28)
Date: Wed, 11 Aug 2021 23:17:59 +0200	[thread overview]
Message-ID: <87lf57y92w.fsf@gmail.com> (raw)
In-Reply-To: <9dd6d3bf-46cc-31a2-aead-3af7d53e741c@gmail.com> (Maxim Nikulin's message of "Wed, 11 Aug 2021 23:16:06 +0700")

Maxim Nikulin <manikulin@gmail.com> writes:

> On 11/08/2021 03:52, Marco Wahl wrote:
>>> Kyle Meyer <kyle@kyleam.com> writes:
>>>> In 61e083732 (org-attach: Possibly delete empty attach directory,
>>>> 2021-07-09), you added a call to directory-empty-p.  This function was
>>>> introduced in Emacs's 0806075520 (Add directory-empty-p and new argument
>>>> COUNT for directory-files-*, 2020-11-02) and hasn't yet made it into a
>>>> release.
>>>> Could you update org-attach-sync to avoid using directory-empty-p (e.g.,
>>>> by inlining it or by adding a compatibility alias)?
>> Starting from Arthur's suggestion and Kyle's hint to the
>> compatibility
>> alias I put org-directory-empty-p into org-compat.el.  So there is
>> org-directory-empty-p now which provides the functionality of
>> directory-empty-p from Emacs 28 for smaller version Emacsen.
> Unfortunately current code causes a compiler warning at least when
> Emacs-25.2 is used:
> Compiling single /home/ubuntu/org-mode/lisp/org-compat.el...
> In end of data:
> org-compat.el:1255:1:Warning: the function ‘directory-empty-p’ is not
> known to
>     be defined.


How make the compiler happy?

What about adding a declare-function for directory-empty-p?  Suggestion
for org-compat.el:

#+begin_src emacs-lisp
;;; Emacs < 28.1 compatibility
(if (version< emacs-version "28")
    (defun org-directory-empty-p (dir)
      "Return t if DIR names an existing directory containing no other files."
      (and (file-directory-p dir)
           (null (directory-files dir nil directory-files-no-dot-files-regexp t))))
  (declare-function directory-empty-p "files" (dir)) ; <-- NEW LINE TO MAKE THE COMPILER HAPPY.
  (defalias 'org-directory-empty-p #'directory-empty-p))

Could you please check the compile with this modification?

Best regards,

  reply	other threads:[~2021-08-11 21:19 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-08 22:33 org-attach-sync uses directory-empty-p (new in Emacs 28) Kyle Meyer
2021-08-09  7:10 ` Arthur Miller
2021-08-10 20:52   ` Marco Wahl
2021-08-11 16:16     ` Maxim Nikulin
2021-08-11 21:17       ` Marco Wahl [this message]
2021-08-12 11:57         ` Maxim Nikulin
2021-08-15  9:11           ` Marco Wahl
2021-08-15 16:27             ` Maxim Nikulin

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:

  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=87lf57y92w.fsf@gmail.com \
    --to=marcowahlsoft@gmail.com \
    --cc=emacs-orgmode@gnu.org \
    --cc=manikulin@gmail.com \


* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox


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).