summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicholas Savage <nick@nicksavage.ca>2021-05-01 20:05:09 -0400
committerBastien <bzg@gnu.org>2021-05-02 19:21:44 +0200
commit562e325c7582eb365d5d8832e17f08169008dec0 (patch)
treee99439b9db2f744b42f8b541532002bcb85d305a
parent3e497bec351c7efad214e26ff7ea92fe93c7a527 (diff)
downloadorg-mode-562e325c7582eb365d5d8832e17f08169008dec0.tar.gz
lisp/org-colview.el: Update org-columns to respect global-visual-line-mode
* lisp/org-colview.el (org-columns): Prevent enabling `truncate-lines' when `global-visual-line-mode' is enabled. This fixes a bug where `org-columns' overlays were disabling wrapping of lines when `global-visual-line-mode` was already activated, and so therefore expectation was that the lines would continue wrapping. This is because `org-columns' was setting truncate-lines to t, when global-visual-line-mode requires it to be set to nil. The interaction between the two caused the wrapping not to occur.
-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 517bcdf..9dad8c7 100644
--- a/lisp/org-colview.el
+++ b/lisp/org-colview.el
@@ -879,7 +879,8 @@ When COLUMNS-FMT-STRING is non-nil, use it as the column format."
(unless (local-variable-p 'org-colview-initial-truncate-line-value)
(setq-local org-colview-initial-truncate-line-value
truncate-lines))
- (setq truncate-lines t)
+ (if (not global-visual-line-mode)
+ (setq truncate-lines t))
(dolist (entry cache)
(goto-char (car entry))
(org-columns--display-here (cdr entry)))))))))