[elpa] externals/company 8b58e58 4/4: Merge pull request #1271 from yugaego/scrollbar

[ELPA Syncer]

branch: externals/company
commit 8b58e5895c2eaf8686de0e25c807b00fdb205c7a
Merge: b180aa3 ac35ff9
Author: Dmitry Gutov <dgu...@yandex.ru>
Commit: GitHub <nore...@github.com>

    Merge pull request #1271 from yugaego/scrollbar
    
    Rename tooltip scrollbar faces
---
 NEWS.md    |  3 +++
 company.el | 22 ++++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/NEWS.md b/NEWS.md
index f5004ef..3c98ac6 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,9 @@
 
 ## Next
 
+* Faces `company-scrollbar-fg` and `company-scrollbar-bg` have been renamed to
+  `company-tooltip-scrollbar-thumb` and `company-tooltip-scrollbar-track`
+  respectively.
 * Better compatibility with `visual-line-mdoe`
   ([#1257](https://github.com/company-mode/company-mode/issues/1257)).
 * Better compatibility with `org-indent-mode`
diff --git a/company.el b/company.el
index d5d843b..0809414 100644
--- a/company.el
+++ b/company.el
@@ -140,19 +140,29 @@
   "Face used for the selected quick-access hints shown in the tooltip."
   :package-version '(company . "0.9.14"))
 
-(defface company-scrollbar-fg
+(define-obsolete-face-alias
+ 'company-scrollbar-fg
+ 'company-tooltip-scrollbar-thumb
+ "0.9.14")
+
+(defface company-tooltip-scrollbar-thumb
   '((((background light))
      :background "darkred")
     (((background dark))
      :background "gray33"))
-  "Face used for the tooltip scrollbar thumb.")
+  "Face used for the tooltip scrollbar thumb (bar).")
+
+(define-obsolete-face-alias
+ 'company-scrollbar-bg
+ 'company-tooltip-scrollbar-track
+ "0.9.14")
 
-(defface company-scrollbar-bg
+(defface company-tooltip-scrollbar-track
   '((((background light))
      :background "wheat")
     (((background dark))
      :background "gray28"))
-  "Face used for the tooltip scrollbar background.")
+  "Face used for the tooltip scrollbar track (trough).")
 
 (defface company-preview
   '((default :inherit (company-tooltip-selection company-tooltip)))
@@ -3384,8 +3394,8 @@ but adjust the expected values appropriately."
 (defun company--scrollbar (i bounds)
   (propertize " " 'face
               (if (and (>= i (car bounds)) (<= i (cdr bounds)))
-                  'company-scrollbar-fg
-                'company-scrollbar-bg)))
+                  'company-tooltip-scrollbar-thumb
+                'company-tooltip-scrollbar-track)))
 
 (defun company--scrollpos-line (text width fancy-margin-width)
   (propertize (concat (company-space-string company-tooltip-margin)