[ELPA-diffs] [elpa] 05/14: Fix #43

[emacs-devel]

This is an automated email from the git hooks/post-receive script.

root pushed a commit to branch master
in repository elpa.

commit f4174bc6156a831a9a465c0f60da004e9997fa1a
Author: Dmitry Gutov <address@hidden>
Date:   Mon Dec 23 12:46:38 2013 +0200

    Fix #43
---
 company-tests.el |    7 +++++++
 company.el       |    6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/company-tests.el b/company-tests.el
index 870ad2b..016e439 100644
--- a/company-tests.el
+++ b/company-tests.el
@@ -198,6 +198,13 @@
         (should (string= (overlay-get ov 'company-after)
                          " 123\nc45 c\nddd\n")))))))
 
+(ert-deftest company-create-lines-shows-numbers ()
+  (let ((company-show-numbers t)
+        (company-candidates '("x" "y" "z"))
+        (company-candidates-length 3))
+    (should (equal '("x 1" "y 2" "z 3")
+                   (company--create-lines 0 999)))))
+
 (ert-deftest company-column-with-composition ()
   (with-temp-buffer
     (insert "lambda ()")
diff --git a/company.el b/company.el
index bee150c..0d3bb38 100644
--- a/company.el
+++ b/company.el
@@ -1773,8 +1773,10 @@ Example: \(company-begin-with '\(\"foo\" \"foobar\" 
\"foobarbaz\"\)\)"
 
     (dotimes (_ len)
       (setq width (max (length (pop lines-copy)) width)))
-    (setq width (min width (window-width)))
-
+    (setq width (min (window-width)
+                     (if company-show-numbers
+                         (+ 2 width)
+                       width)))
     (setq lines-copy lines)
 
     ;; number can make tooltip too long

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.