branch: externals-release/org
commit 3b0f08f8424b3fa2acc53a424e9ba2a97997fa1c
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
org-replace-buffer-contents: Do not use obsolete `replace-buffer-contents'
in Emacs 31+
* lisp/org-compat.el (org-replace-buffer-contents): In Emacs 31 and
newer, where `replace-buffer-contents' is obsolete, use
`replace-region-contents' with the newly introduced SOURCE argument
value type (buffer).
---
lisp/org-compat.el | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 011d012355..c907039bb3 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -292,10 +292,16 @@ older than 27.1"
(if tree (push tree elems))
(nreverse elems))))
-(if (version< emacs-version "27.1")
+(with-no-warnings ; `replace-buffer-contents' is obsolete in Emacs 31
+ (cond
+ ((version< emacs-version "27.1")
(defsubst org-replace-buffer-contents (source &optional _max-secs
_max-costs)
- (replace-buffer-contents source))
- (defalias 'org-replace-buffer-contents #'replace-buffer-contents))
+ (replace-buffer-contents source)))
+ ((version< emacs-version "31")
+ (defalias 'org-replace-buffer-contents #'replace-buffer-contents))
+ (t
+ (defsubst org-replace-buffer-contents (source &optional max-secs max-costs)
+ (replace-region-contents (point-min) (point-max) source max-secs
max-costs)))))
(unless (fboundp 'proper-list-p)
;; `proper-list-p' was added in Emacs 27.1. The function below is
