Use `after-string' instead of `before-string'

Fixes #28

diff --git a/NEWS.md b/NEWS.md
index ec8301144f528e6abe66856fce2ae201bd24ef93..bbbd830dba5e5ae182be4163aeef71dd64f3cc51 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,7 @@
 
 ## Next
 
+* Better `linum` compatibility in Emacs <= 24.2.
 * `company-global-modes`: New option.
 
 ## 2013-05-26 (0.6.10)

diff --git a/company-tests.el b/company-tests.el
index 9f837cbae99a1aa52ea21006273582acf494cec4..9f0e70db4bfa184863fa7d1d5e3d8462392986cd 100644 (file)
--- a/company-tests.el
+++ b/company-tests.el
@@ -195,7 +195,7 @@
         ;; FIXME: Make it 2?
         (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)
+        (should (string= (overlay-get ov 'company-after)
                          " 123\nc45 c\nddd\n")))))))
 
 (ert-deftest company-column-with-composition ()

diff --git a/company.el b/company.el
index 861b422d61812755d2ea29b9c97abcabfadb9577..f8d4a46f11fdf89ad3005e85ded5c4c0b84060c0 100644 (file)
--- a/company.el
+++ b/company.el
@@ -1839,7 +1839,7 @@ Returns a negative number if the tooltip should be displayed above point."
         (overlay-put ov 'company-replacement-args args)
 
         (let ((lines (company--create-lines selection (abs height))))
-          (overlay-put ov 'company-before
+          (overlay-put ov 'company-after
                        (apply 'company--replacement-string lines args))
           (overlay-put ov 'company-width (string-width (car lines))))
 
@@ -1853,7 +1853,7 @@ Returns a negative number if the tooltip should be displayed above point."
 
 (defun company-pseudo-tooltip-edit (selection)
   (let ((height (overlay-get company-pseudo-tooltip-overlay 'company-height)))
-    (overlay-put company-pseudo-tooltip-overlay 'company-before
+    (overlay-put company-pseudo-tooltip-overlay 'company-after
                  (apply 'company--replacement-string
                         (company--create-lines selection (abs height))
                         (overlay-get company-pseudo-tooltip-overlay
@@ -1868,7 +1868,7 @@ Returns a negative number if the tooltip should be displayed above point."
   (when (overlayp company-pseudo-tooltip-overlay)
     (overlay-put company-pseudo-tooltip-overlay 'invisible nil)
     (overlay-put company-pseudo-tooltip-overlay 'line-prefix nil)
-    (overlay-put company-pseudo-tooltip-overlay 'before-string nil)))
+    (overlay-put company-pseudo-tooltip-overlay 'after-string nil)))
 
 (defun company-pseudo-tooltip-unhide ()
   (when company-pseudo-tooltip-overlay
@@ -1877,8 +1877,8 @@ Returns a negative number if the tooltip should be displayed above point."
     (overlay-put company-pseudo-tooltip-overlay 'priority 1)
     ;; No (extra) prefix for the first line.
     (overlay-put company-pseudo-tooltip-overlay 'line-prefix "")
-    (overlay-put company-pseudo-tooltip-overlay 'before-string
-                 (overlay-get company-pseudo-tooltip-overlay 'company-before))
+    (overlay-put company-pseudo-tooltip-overlay 'after-string
+                 (overlay-get company-pseudo-tooltip-overlay 'company-after))
     (overlay-put company-pseudo-tooltip-overlay 'window (selected-window))))
 
 (defun company-pseudo-tooltip-guard ()