[elpa] externals/org 562e325 1/2: lisp/org-colview.el: Update org-columns to respect global-visual-line-mode

[ELPA Syncer]

branch: externals/org
commit 562e325c7582eb365d5d8832e17f08169008dec0
Author: Nicholas Savage <nick@nicksavage.ca>
Commit: Bastien <bzg@gnu.org>

    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.
---
 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 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)))))))))