From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 24 Jun 2015 10:34:41 +0000 (+0300)
Subject: Support whitespace-mode newline-mark
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/2306c9cb1ac7ef0e5c0120269c7f1c3a768e94b7

Support whitespace-mode newline-mark

Fixes #370
---

diff --git a/company.el b/company.el
index 5c20c0516..8500a4d93 100644
--- a/company.el
+++ b/company.el
@@ -2400,6 +2400,10 @@ If SHOW-VERSION is non-nil, show the version in the echo area."
                (version< emacs-version "24.4.51.5"))
       ;; http://debbugs.gnu.org/18384
       (cl-decf ww))
+    ;; whitespace-mode with newline-mark
+    (when (and buffer-display-table
+               (aref buffer-display-table ?\n))
+      (cl-decf ww (1- (length (aref buffer-display-table ?\n)))))
     ww))
 
 (defun company--replacement-string (lines old column nl &optional align-top)