[elpa] externals/org add8552b1d 36/50: Backport commit 48aacbf29 from Emacs

[ELPA Syncer]

branch: externals/org
commit add8552b1d50030bb919c63d1e5daf7f611f2677
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Kyle Meyer <kyle@kyleam.com>

    Backport commit 48aacbf29 from Emacs
    
    * lisp/oc-basic.el (org-cite-basic--set-keymap): Adjust
    buffer-substring generalized variable usage.
    
    Make many seldom-used generalized variables obsolete
    48aacbf292fbe8d4be7761f83bf87de93497df27
    Lars Ingebrigtsen
    Sun Aug 21 22:12:43 2022 +0200
    
    [ km: This was independently covered on the main branch with
      a526ea6a3.  I'm applying it here too for bookkeeping/traceability
      purposes. ]
---
 lisp/oc-basic.el | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/lisp/oc-basic.el b/lisp/oc-basic.el
index 8c76e200e4..398d2e2d3f 100644
--- a/lisp/oc-basic.el
+++ b/lisp/oc-basic.el
@@ -460,12 +460,13 @@ substitutes for the unknown key.  Finally, it may be the 
symbol
         (_
          (lambda ()
            (interactive)
-           (setf (buffer-substring beg end)
-                 (concat "@"
-                         (if (= 1 (length suggestions))
-                             (car suggestions)
-                           (completing-read "Did you mean: "
-                                            suggestions nil t))))))))
+           (goto-char beg)
+           (delete-region beg end)
+           (insert "@"
+                   (if (= 1 (length suggestions))
+                       (car suggestions)
+                     (completing-read "Did you mean: "
+                                      suggestions nil t)))))))
     (put-text-property beg end 'keymap km)))
 
 (defun org-cite-basic-activate (citation)