Merge pull request #164 from holomorph/tooltip-search

Assign a face for the tooltip search string

diff --combined company.el
index 276e0b4b1a5e59223d5c8c6e03d3ca22dadfa008,577049fbd4dc213c44ac9aa3a2068864146b111e..7d5ec8cad41d247b1a4cd6e65c8e0a2fbce10ec3
--- 1/company.el
--- 2/company.el
+++ b/company.el
@@@ -117,6 -117,10 +117,10 @@@ buffer-local wherever it is set.
      (t (:background "green")))
    "Face used for the selection in the tooltip.")
  
+ (defface company-tooltip-search
+   '((default :inherit company-tooltip-selection))
+   "Face used for the search string in the tooltip.")
+ 
  (defface company-tooltip-mouse
    '((default :inherit highlight))
    "Face used for the tooltip item under the mouse.")
@@@ -2156,7 -2160,7 +2160,7 @@@ If SHOW-VERSION is non-nil, show the ve
                               (length company-prefix)))
            (let ((beg (+ margin (match-beginning 0)))
                  (end (+ margin (match-end 0))))
-             (add-text-properties beg end '(face company-tooltip-selection)
+             (add-text-properties beg end '(face company-tooltip-search)
                                   line)
              (when (< beg common)
                (add-text-properties beg common
@@@ -2359,8 -2363,12 +2363,8 @@@
  
  ;; show
  
 -(defsubst company--window-inner-height ()
 -  (let ((edges (window-inside-edges)))
 -    (- (nth 3 edges) (nth 1 edges))))
 -
  (defsubst company--window-width ()
 -  (let ((ww (window-width)))
 +  (let ((ww (window-body-width)))
      ;; Account for the line continuation column.
      (when (zerop (cadr (window-fringes)))
        (cl-decf ww))
@@@ -2378,7 -2386,7 +2382,7 @@@
    "Calculate the appropriate tooltip height.
  Returns a negative number if the tooltip should be displayed above point."
    (let* ((lines (company--row))
 -         (below (- (company--window-inner-height) 1 lines)))
 +         (below (- (window-body-height) 1 lines)))
      (if (and (< below (min company-tooltip-minimum company-candidates-length))
               (> lines below))
          (- (max 3 (min company-tooltip-limit lines)))
@@@ -2546,7 -2554,8 +2550,7 @@@
  (defun company--show-inline-p ()
    (and (not (cdr company-candidates))
         company-common
 -       (string-prefix-p company-prefix company-common
 -                        (company-call-backend 'ignore-case))))
 +       (string-prefix-p company-prefix company-common)))
  
  ;;; echo ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  
@@@ -2575,7 -2584,7 +2579,7 @@@
  
  (defun company-echo-format ()
  
 -  (let ((limit (window-width (minibuffer-window)))
 +  (let ((limit (window-body-width (minibuffer-window)))
          (len -1)
          ;; Roll to selection.
          (candidates (nthcdr company-selection company-candidates))
@@@ -2605,7 -2614,7 +2609,7 @@@
  
  (defun company-echo-strip-common-format ()
  
 -  (let ((limit (window-width (minibuffer-window)))
 +  (let ((limit (window-body-width (minibuffer-window)))
          (len (+ (length company-prefix) 2))
          ;; Roll to selection.
          (candidates (nthcdr company-selection company-candidates))