[elpa] externals-release/org 6c534bfc13 1/4: Revert "Use `replace-region-contents' instead of `replace-buffer-contents'"

[ELPA Syncer]

branch: externals-release/org
commit 6c534bfc130a968401672d97b3a88afabc22c37e
Author: Ihor Radchenko <yanta...@posteo.net>
Commit: Ihor Radchenko <yanta...@posteo.net>

    Revert "Use `replace-region-contents' instead of `replace-buffer-contents'"
    
    This reverts commit d2e1c6789e8fdbc097cdec87d69dc2fce32cb6d5.
    
    In Emacs <31, `replace-region-contents' cannot take buffer as argument
    yet.  We need some other fix.
    
    Reported-by: Kyle Meyer <k...@kyleam.com>
    Link: https://orgmode.org/list/87o6wbeise....@kyleam.com
---
 lisp/org-compat.el | 9 ++++-----
 lisp/org-src.el    | 4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index 64db2e6307..011d012355 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -292,11 +292,10 @@ older than 27.1"
       (if tree (push tree elems))
       (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)))
+(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))
 
 (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 d3f40cf355..6570b1b2ab 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -1420,7 +1420,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)
@@ -1468,7 +1468,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))