Make toggle-truncate-lines disable visual-line-mode

* lisp/simple.el (toggle-truncate-lines): Disable
`visual-line-mode' (bug#29664).

diff --git a/lisp/simple.el b/lisp/simple.el
index d6c448b36a536fccda8d13748969011aa08c4ba9..c6495166ffc776b8b8626743e4306c15fcf70f6b 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -8306,8 +8306,13 @@ non-nil."
                      (if (eq buffer (window-buffer window))
                          (set-window-hscroll window 0)))
                    nil t)))
-  (message "Truncate long lines %s"
-          (if truncate-lines "enabled" "disabled")))
+  (message "Truncate long lines %s%s"
+          (if truncate-lines "enabled" "disabled")
+           (if (and truncate-lines visual-line-mode)
+               (progn
+                 (visual-line-mode -1)
+                 (message " and `visual-line-mode' disabled"))
+             "")))
 
 (defun toggle-word-wrap (&optional arg)
   "Toggle whether to use word-wrapping for continuation lines.