0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-08-26 08:32:51 +00:00

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-11-06 10:02:18 +01:00
commit 990339ea23
2 changed files with 3 additions and 5 deletions

View file

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

View file

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