Merge branch 'maint'

2 files changed, 3 insertions, 5 deletions

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index f9aac48..b818073 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -9145,7 +9145,7 @@ Called with a universal prefix arg, show the priority instead of setting it."
       (goto-char (point-max))
       (while (not (bobp))
 	(when (equal marker (org-get-at-bol 'org-marker))
-	  (org-move-to-column (- (window-width) (length stamp)) t)
+	  (org-move-to-column (- (window-width) (length stamp)) t nil t)
 	  (org-agenda-fix-tags-filter-overlays-at (point))
           (if (featurep 'xemacs)
 	      ;; Use `duplicable' property to trigger undo recording
diff --git a/lisp/org-compat.el b/lisp/org-compat.el
index c4d15d8..b714f13 100644
--- a/lisp/org-compat.el
+++ b/lisp/org-compat.el
@@ -335,10 +335,8 @@ Works on both Emacs and XEmacs."
       (org-xemacs-without-invisibility (indent-line-to column))
     (indent-line-to column)))
 
-(defun org-move-to-column (column &optional force buffer)
-  ;; set buffer-invisibility-spec to nil so that move-to-column
-  ;; does the right thing despite the presence of invisible text.
-  (let ((buffer-invisibility-spec nil))
+(defun org-move-to-column (column &optional force buffer ignore-invisible)
+  (let ((buffer-invisibility-spec ignore-invisible))
     (if (featurep 'xemacs)
 	(org-xemacs-without-invisibility (move-to-column column force buffer))
       (move-to-column column force))))