Pārlūkot izejas kodu

Merge branch 'bugfix'

Bastien 4 gadi atpakaļ
vecāks
revīzija
faf1ba8cde
1 mainītis faili ar 2 papildinājumiem un 1 dzēšanām
  1. 2 1
      lisp/org.el

+ 2 - 1
lisp/org.el

@@ -7888,7 +7888,8 @@ called immediately, to move the markers with the entries."
   "Check if MARKER is between BEG and END.
   "Check if MARKER is between BEG and END.
 If yes, remember the marker and the distance to BEG."
 If yes, remember the marker and the distance to BEG."
   (when (and (marker-buffer marker)
   (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))
 	     (>= marker beg) (< marker end))
     (push (cons marker (- marker beg)) org-markers-to-move)))
     (push (cons marker (- marker beg)) org-markers-to-move)))