From c307c9648d541338814fe541389ea8c7a1cf50a5 Mon Sep 17 00:00:00 2001
From: Mauro Aranda <maurooaranda@gmail.com>
Date: Fri, 30 Oct 2020 11:13:34 -0300
Subject: [PATCH] Give the scroll-bar face a non-trivial spec

* lisp/faces.el (scroll-bar): Give it a non-trivial spec, so when
resetting it to its face-defface-spec, we effectively reset it.
(Bug#13476)
---
 lisp/faces.el | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lisp/faces.el b/lisp/faces.el
index 0ce95322703..728f8b0fe67 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -2716,9 +2716,11 @@ used to display the prompt text."
   :group 'frames
   :group 'basic-faces)
 
-(defface scroll-bar '((t nil))
+(defface scroll-bar
+  '((((background light)) :foreground "black")
+    (((background dark))  :foreground "white"))
   "Basic face for the scroll bar colors under X."
-  :version "21.1"
+  :version "28.1"
   :group 'frames
   :group 'basic-faces)
 
-- 
2.39.2