summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2017-09-26 20:03:03 +0200
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2017-09-26 20:03:03 +0200
commit226d2fcaa2bdac513277c0d24af2ba420883793e (patch)
tree9b532ddf06b1d204efe355a1d08aeae9412ad635
parentd40deb6967dd7d2369576319cd1c517e1c454b95 (diff)
downloadorg-mode-226d2fcaa2bdac513277c0d24af2ba420883793e.tar.gz
org-colview: Fix "wrong-type-argument markerp nil"
* lisp/org-colview.el (org-columns-remove-overlays): Fix "wrong-type-argument markerp nil". When calling `org-agenda-columns', `org-columns-top-level-marker' is not set. Handle this situation. Reported-by: Benjamin Beckwith <bnbeckwith@gmail.com> <http://lists.gnu.org/archive/html/emacs-orgmode/2017-09/msg00566.html>
-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 242bdc2..eac29c5 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -464,7 +464,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)