branch: externals/org
commit 827399e03bc8b366b47fe11d028350f157b48ac1
Merge: ad9112dad4 3b0f08f842
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>
Merge branch 'bugfix'
---
lisp/org-compat.el | 13 +++++++++----
lisp/org-src.el | 4 ++--
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 92ba488641..4f58a6351c 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -293,10 +293,15 @@ older than 27.1"
(nreverse elems))))
(with-no-warnings ; `replace-buffer-contents' is obsolete in Emacs 31
- (if (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)))
+ (cond
+ ((version< emacs-version "27.1")
+ (defsubst org-replace-buffer-contents (source &optional _max-secs
_max-costs)
+ (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
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 88da62f534..2b2dab7725 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -1433,7 +1433,7 @@ EVENT is passed to `mouse-set-point'."
(insert (with-current-buffer write-back-buf
(buffer-string))))
(save-restriction
(narrow-to-region beg end)
- (replace-region-contents beg end write-back-buf 0.1 nil)
+ (org-replace-buffer-contents write-back-buf 0.1 nil)
(goto-char (point-max))))
(when (and expecting-bol (not (bolp))) (insert "\n")))
(kill-buffer write-back-buf)
@@ -1484,7 +1484,7 @@ EVENT is passed to `mouse-set-point'."
(buffer-string))))
(save-restriction
(narrow-to-region beg end)
- (replace-region-contents beg end write-back-buf 0.1 nil)
+ (org-replace-buffer-contents write-back-buf 0.1 nil)
(goto-char (point-max))))
(when (and expecting-bol (not (bolp))) (insert "\n")))))
(when write-back-buf (kill-buffer write-back-buf))
