Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2017-09-26 20:05:07 +02:00
commit fbf47cde94
1 changed files with 2 additions and 1 deletions

View File

@ -488,7 +488,8 @@ for the duration of the command.")
(kill-local-variable 'org-previous-header-line-format)
(remove-hook 'post-command-hook 'org-columns-hscroll-title 'local))
(set-marker org-columns-begin-marker nil)
(set-marker org-columns-top-level-marker nil)
(when (markerp org-columns-top-level-marker)
(set-marker org-columns-top-level-marker nil))
(org-with-silent-modifications
(mapc #'delete-overlay org-columns-overlays)
(setq org-columns-overlays nil)