mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

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:
Bastien Guerry 2012-08-14 12:02:03 +02:00
parent a4f5e94dc8 16a2203f6f
commit 570e30b5dd
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lisp/org-element.el
View File

@ -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)))))