emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals-release/org 1c3a46268f 4/4: Backport from main: Fix com


From: ELPA Syncer
Subject: [elpa] externals-release/org 1c3a46268f 4/4: Backport from main: Fix compatibility with Emacs 26
Date: Sun, 24 Jul 2022 09:57:44 -0400 (EDT)

branch: externals-release/org
commit 1c3a46268f29bcfa35824c6e68607f6feed99023
Author: Ihor Radchenko <yantar92@gmail.com>
Commit: Ihor Radchenko <yantar92@gmail.com>

    Backport from main: Fix compatibility with Emacs 26
    
    * lisp/org-compat.el (org-replace-buffer-contents): Add compatibility
    function for `replace-buffer-contents'.
    
    * lisp/org-src.el (org-edit-src-save, org-edit-src-exit): Use
    `org-replace-buffer-contents'.
---
 lisp/org-compat.el | 5 +++++
 lisp/org-src.el    | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index c26eb6f10a..da544a567d 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -113,6 +113,11 @@ the symbol of the calling function, for example."
 
 ;;; Emacs < 27.1 compatibility
 
+(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
   ;; taken from Emacs subr.el 200195e824b^.
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 54f901252f..89d0c28a43 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -1235,7 +1235,7 @@ Throw an error if there is no such buffer."
                   (insert (with-current-buffer write-back-buf 
(buffer-string))))
          (save-restriction
            (narrow-to-region beg end)
-           (replace-buffer-contents 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)
@@ -1283,7 +1283,7 @@ Throw an error if there is no such buffer."
                               (buffer-string))))
           (save-restriction
             (narrow-to-region beg end)
-            (replace-buffer-contents 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))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]