From fbb91ddc2bc8b6f29651e3114754bcd8fcad30d0 Mon Sep 17 00:00:00 2001 From: Nicholas Savage Date: Sat, 1 May 2021 20:05:09 -0400 Subject: [PATCH] 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 also enabled Fixing a bug where org-column 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. --- lisp/org-colview.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index 517bcdf1c..9dad8c7d9 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))))))))) -- 2.20.1