branch: externals-release/org commit d2e1c6789e8fdbc097cdec87d69dc2fce32cb6d5 Author: Ihor Radchenko <yanta...@posteo.net> Commit: Ihor Radchenko <yanta...@posteo.net>
Use `replace-region-contents' instead of `replace-buffer-contents' * lisp/org-src.el (org-edit-src-save): (org-edit-src-exit): Avoid using obsolete `replace-region-contents'. * lisp/org-compat.el (org-replace-buffer-contents): Suppress compiler warning. Note that we also no longer use `org-replace-buffer-contents' in the code, but not yet obsoleting it as this commit is for bugfix branch. --- lisp/org-compat.el | 9 +++++---- lisp/org-src.el | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/lisp/org-compat.el b/lisp/org-compat.el index 011d012355..64db2e6307 100644 --- a/lisp/org-compat.el +++ b/lisp/org-compat.el @@ -292,10 +292,11 @@ older than 27.1" (if tree (push tree elems)) (nreverse elems)))) -(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)) +(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))) (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 6570b1b2ab..d3f40cf355 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) - (org-replace-buffer-contents write-back-buf 0.1 nil) + (replace-region-contents beg end 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) - (org-replace-buffer-contents write-back-buf 0.1 nil) + (replace-region-contents beg end 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))