branch: externals/org
commit faf1ba8cde1883a4601b586a9e5a10ed7777e803
Merge: 18f6ef8 97de19f
Author: Bastien <[email protected]>
Commit: Bastien <[email protected]>
Merge branch 'bugfix'
---
lisp/org.el | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lisp/org.el b/lisp/org.el
index 630bfb1..a973b7a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7888,7 +7888,8 @@ called immediately, to move the markers with the entries."
"Check if MARKER is between BEG and END.
If yes, remember the marker and the distance to BEG."
(when (and (marker-buffer marker)
- (equal (marker-buffer marker) (current-buffer))
+ (or (equal (marker-buffer marker) (current-buffer))
+ (equal (marker-buffer marker) (buffer-base-buffer
(current-buffer))))
(>= marker beg) (< marker end))
(push (cons marker (- marker beg)) org-markers-to-move)))
