[elpa] externals/nano-modeline 394742c8ad 5/5: Merge remote-tracking branch 'origin/master'

[ELPA Syncer]

branch: externals/nano-modeline
commit 394742c8adeeff6492dbf64761544a91f1278052
Merge: fed345f8a4 ddc260d4e8
Author: Nicolas P. Rougier <Nicolas.Rougier@inria.fr>
Commit: Nicolas P. Rougier <Nicolas.Rougier@inria.fr>

    Merge remote-tracking branch 'origin/master'
---
 nano-modeline.el | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nano-modeline.el b/nano-modeline.el
index fa37d2b0c1..dd00c58f3d 100644
--- a/nano-modeline.el
+++ b/nano-modeline.el
@@ -172,7 +172,7 @@
        :family "Roboto Mono"
        :box (:line-width 2
              :color ,(face-foreground 'default)
-             :style none)))
+             :style flat-button)))
   "Active button face")
 
 (defface nano-modeline-button-inactive-face
@@ -181,7 +181,7 @@
        :family "Roboto Mono"
        :box (:line-width 2
              :color ,(face-foreground 'default)
-             :style none)))
+             :style flat-button)))
   "Inactive button face.")
 
 (defface nano-modeline-button-highlight-face
@@ -191,6 +191,8 @@
        :weight bold))
   "Highlight button face.")
 
+(defvar nano-modeline-base-face nil)
+
 (defun nano-modeline--stroke-width (face)
   "Extract the line width of the box for the given FACE."
   
@@ -250,9 +252,9 @@ make it inherit the base face."
          (state (intern (concat (symbol-name face-prefix)
                                 (if active "-active" "-inactive"))))
          (face (cdr (assoc state nano-modeline-faces)))
-         (face (if (boundp 'nano-modeline-base-face)
-                           (push nano-modeline-base-face face)
-                   face))
+         (face (if nano-modeline-base-face
+                   (push nano-modeline-base-face face)
+                 face))
          (face (reverse face)))
     `(:inherit ,face)))