1 files changed, 14 insertions, 3 deletions

@@ -2322,8 +2322,11 @@ the default is \"/\"."
               (list
                (propertize " "
                            'display
-                           '((space :align-to 
-                                    ,(unless visual-fill-column-mode 0))))
+                           '((space
+                              :align-to 
+                              ,(unless
+                                   (bound-and-true-p visual-fill-column-mode)
+                                 0))))
                (funcall topsy-fn))))))
 
 (setup (:straight trashed)
@@ -2419,7 +2422,15 @@ If used with a numeric prefix argument N, N backticks will be inserted."
                (setq-local indicate-empty-lines nil
                            indicate-buffer-boundaries nil)
              (acdw/setup-fringes))))
-  (:advise text-scale-adjust :after #'visual-fill-column-adjust))
+  (:advise text-scale-adjust :after #'visual-fill-column-adjust)
+  ;; Fix bindings
+  (when (bound-and-true-p mouse-wheel-mode)
+    (with-eval-after-load 'visual-fill-column
+      (dolist (margin '(right-margin left-margin))
+        (dolist (event '(wheel-down wheel-up))
+          (define-key visual-fill-column-mode-map
+            (vector margin event)
+            #'mwheel-scroll))))))
 
 (setup (:straight visual-regexp)
   (:global "M-%" #'vr/query-replace))