Check in NEWS and tests for the previous commit

diff --git a/NEWS.md b/NEWS.md
index 1c33f7cb710d5c4d6bc459cb470e035521dc811e..e5ad713e97f6d6e86f389686667f65c1eda2a05c 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,5 +1,9 @@
 # History of user-visible changes
 
+## Next
+
+* Works in horizontally scrolled windows.
+
 ## 2013-05-10 (0.6.9)
 
 * `company-capf` respects `:exit-function` completion property.

diff --git a/company-tests.el b/company-tests.el
index 011a5d46c57be8c45d5d1c3fdbd90f19e6faad0e..a8bdaa932307f73837733f0e2d3986e8af6fcf71 100644 (file)
--- a/company-tests.el
+++ b/company-tests.el
@@ -179,33 +179,23 @@
         (company-call 'open-line 1)
         (should (eq 2 (overlay-start company-pseudo-tooltip-overlay)))))))
 
-(defun company-test-pseudo-tooltip-overlay-show ()
-  (save-window-excursion
+(ert-deftest company-pseudo-tooltip-overlay-show ()
+  (with-temp-buffer
+    (save-window-excursion
     (set-window-buffer nil (current-buffer))
     (insert "aaaa\n bb\nccccc\nddd")
     (search-backward "bb")
-    (let ((col-row (company--col-row))
+    (let ((col (company--column))
           (company-candidates-length 2)
           (company-candidates '("123" "45")))
-      (company-pseudo-tooltip-show (cdr col-row) (car col-row) 0)
+      (company-pseudo-tooltip-show (company--row) col 0)
       (let ((ov company-pseudo-tooltip-overlay))
         (should (eq (overlay-get ov 'company-width) 3))
         ;; FIXME: Make it 2?
-        (should (eq (overlay-get ov 'company-height) 10))
-        (should (eq (overlay-get ov 'company-column) (car col-row)))
+        (should (eq (overlay-get ov 'company-height) company-tooltip-limit))
+        (should (eq (overlay-get ov 'company-column) col))
         (should (string= (overlay-get ov 'company-before)
-                         " 123\nc45 c\nddd\n"))))))
-
-(ert-deftest company-pseudo-tooltip-overlay-show ()
-  :tags '(interactive)
-  (with-temp-buffer
-    (company-test-pseudo-tooltip-overlay-show)))
-
-(ert-deftest company-pseudo-tooltip-overlay-show-with-header-line ()
-  :tags '(interactive)
-  (with-temp-buffer
-    (setq header-line-format "foo bar")
-    (company-test-pseudo-tooltip-overlay-show)))
+                         " 123\nc45 c\nddd\n")))))))
 
 ;;; Template