company-select-mouse: update for when scrollbar is used

diff --git a/company.el b/company.el
index d7b96c5c389cf4adc85e3776db5833b36d1df1bf..927c9989d1c1734f7d741eec9591d680fcd04102 100644 (file)
--- a/company.el
+++ b/company.el
@@ -1435,9 +1435,10 @@ and invoke the normal binding."
              (company--inside-tooltip-p event-col-row ovl-row ovl-height))
         (progn
           (company-set-selection (+ (cdr event-col-row)
-                                    (if (zerop company-tooltip-offset)
-                                        -1
-                                      (- company-tooltip-offset 2))
+                                    (1- company-tooltip-offset)
+                                    (if (and (eq company-tooltip-offset-display 'lines)
+                                             (not (zerop company-tooltip-offset)))
+                                        -1 0)
                                     (- ovl-row)
                                     (if (< ovl-height 0)
                                         (- 1 ovl-height)