mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-07-16 22:46:26 +00:00
Merge branch 'master' of orgmode.org:org-mode
# Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
This commit is contained in:
commit
570e30b5dd
|
@ -4265,21 +4265,19 @@ end of ELEM-A."
|
||||||
(org-indent-to-column ind-B))
|
(org-indent-to-column ind-B))
|
||||||
(insert body-A)
|
(insert body-A)
|
||||||
;; Restore ex ELEM-A overlays.
|
;; Restore ex ELEM-A overlays.
|
||||||
(mapc (lambda (ov)
|
(let ((offset (- beg-B beg-A)))
|
||||||
(move-overlay
|
(mapc (lambda (ov)
|
||||||
(car ov)
|
(move-overlay
|
||||||
(+ (nth 1 ov) (- beg-B beg-A))
|
(car ov) (+ (nth 1 ov) offset) (+ (nth 2 ov) offset)))
|
||||||
(+ (nth 2 ov) (- beg-B beg-A))))
|
(car overlays))
|
||||||
(car overlays))
|
(goto-char beg-A)
|
||||||
(goto-char beg-A)
|
(delete-region beg-A end-A)
|
||||||
(delete-region beg-A end-A)
|
(insert body-B)
|
||||||
(insert body-B)
|
;; Restore ex ELEM-B overlays.
|
||||||
;; Restore ex ELEM-B overlays.
|
(mapc (lambda (ov)
|
||||||
(mapc (lambda (ov)
|
(move-overlay
|
||||||
(move-overlay (car ov)
|
(car ov) (- (nth 1 ov) offset) (- (nth 2 ov) offset)))
|
||||||
(+ (nth 1 ov) (- beg-A beg-B))
|
(cdr overlays)))
|
||||||
(+ (nth 2 ov) (- beg-A beg-B))))
|
|
||||||
(cdr overlays))
|
|
||||||
(goto-char (org-element-property :end elem-B)))))
|
(goto-char (org-element-property :end elem-B)))))
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue