summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-09-26 20:05:07 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-09-26 20:05:07 +0200
commitfbf47cde94593e6f8ebed233d390129bbed78779 (patch)
treeb5e4195cead87facf61f3e6dcef75a0dd518c0ad
parent80eca1d31f0d4cfeb6a2f522290c2cb7ab712734 (diff)
parent226d2fcaa2bdac513277c0d24af2ba420883793e (diff)
downloadorg-mode-fbf47cde94593e6f8ebed233d390129bbed78779.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-colview.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-colview.el b/lisp/org-colview.el
index 2699d52..2a427ae 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -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)