[elpa] externals/hyperbole 78c18ab: Try to use one defface for flash and highlight (#34)

[ELPA Syncer]

branch: externals/hyperbole
commit 78c18abf6c2773b19953cd3a4a9e18fe09687422
Author: Mats Lidell <mats.lidell@lidells.se>
Commit: GitHub <noreply@github.com>

    Try to use one defface for flash and highlight (#34)
---
 ChangeLog     |  20 +++++
 hui-em-but.el | 245 ++++------------------------------------------------------
 hyrolo.el     |  16 +---
 3 files changed, 38 insertions(+), 243 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b7d2646..fdb1bf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,26 @@
 * hypb-ert.el (hypb-ert-sym, hypb-ert-sel): Change 2nd args to
     strings to fix Emacs 27 byte-compile error.
 
+2021-05-01  Mats Lidell  <matsl@gnu.org>
+
+* hui-em-but.el (hbut-flash): Set defaults
+    (hproperty:color-list): Use defined-colors
+
+2021-04-30  Mats Lidell  <matsl@gnu.org>
+
+* hyrolo.el (hyrolo-highlight-face): Use the 'match face for rolo
+    searches.
+    (hyrolo-initialize-highlight-face): Remove since not needed when using
+    'match face.
+
+* hui-em-but.el (hbut-flash): Specify a face for flashing that supports
+    light and dark background using built in functionality.
+    (hproperty:background, hproperty:foreground)
+    (hproperty:item-highlight-color, hproperty:but-color)
+    (hproperty:set-flash-color, hproperty:set-item-highlight)
+    (hproperty:set-face-after-init): Remove since not needed when using a
+    fully specified face.
+
 2021-04-30  Bob Weiner  <rsw@gnu.org>
 
 * hpath.el (hpath:at-p):
diff --git a/hui-em-but.el b/hui-em-but.el
index e380e7c..91022f5 100644
--- a/hui-em-but.el
+++ b/hui-em-but.el
@@ -29,22 +29,6 @@
 (require 'hbut)
 (eval-when-compile (require 'hyrolo))
 
-(defun hproperty:background ()
-  "Return default background color for current frame."
-  (or (face-background (defface default nil
-                        "Standard text face."
-                        :group 'hyperbole-buttons))
-      (cdr (assq 'background-color (frame-parameters)))
-      "White"))
-
-(defun hproperty:foreground ()
-  "Return default foreground color for current frame."
-  (or (face-foreground (defface default nil
-                        "Standard text face."
-                        :group 'hyperbole-buttons))
-      (cdr (assq 'foreground-color (frame-parameters)))
-      "Black"))
-
 ;;; ************************************************************************
 ;;; Public variables
 ;;; ************************************************************************
@@ -64,24 +48,29 @@
   :type '(integer :match (lambda (_widget value) (and (integerp value) (> 
value 0))))
   :group 'hyperbole-buttons)
 
-(defcustom hproperty:item-highlight-color (hproperty:foreground)
-  "Color with which to highlight list/menu selections.
-Call (hproperty:set-item-highlight <color>) to change value."
-  :type 'color
-  :initialize #'custom-initialize-default
+(defface hbut-flash
+  '((((class color) (min-colors 88) (background light))
+     :background "red3")
+    (((class color) (min-colors 88) (background dark))
+     :background "red3")
+    (((class color) (min-colors 16) (background light))
+     :background "red3")
+    (((class color) (in-colors 16) (background dark))
+     :background "red3")
+    (((class color) (min-colors 8))
+     :background "red3" :foreground "black")
+    (t :inverse-video t))
+  "Face for flashing buttons."
   :group 'hyperbole-buttons)
 
-(defcustom hproperty:flash-face (defface hbut-flash nil "Hyperbole face for 
flashing hyper-buttons."
-                                 :group 'hyperbole-buttons)
+(defcustom hproperty:flash-face 'hbut-flash
   "Hyperbole face for flashing hyper-buttons."
   :type 'face
   :initialize #'custom-initialize-default
   :group 'hyperbole-buttons)
 
-(defcustom hproperty:highlight-face (defface hproperty:highlight-face nil
-                                     "Item highlighting face.  Use 
(hproperty:set-item-highlight) to set."
-                                     :group 'hyperbole-buttons)
-  "Item highlighting face.  Use (hproperty:set-item-highlight) to set."
+(defcustom hproperty:highlight-face 'highlight
+  "Item highlighting face."
   :type 'face
   :initialize #'custom-initialize-default
   :group 'hyperbole-buttons)
@@ -103,12 +92,6 @@ that button is selectable whenever the mouse cursor moves 
over it."
     (overlay-put but 'face face)
     (when hproperty:but-emphasize-flag (overlay-put but 'mouse-face 
'highlight))))
 
-(defun hproperty:but-color ()
-  "Return current color of buffer's buttons."
-  (if hproperty:color-ptr
-      (car hproperty:color-ptr)
-    (hproperty:foreground)))
-
 (defun hproperty:but-clear ()
   "Delete all Hyperbole buttons from current buffer."
   (interactive)
@@ -181,130 +164,7 @@ highlighted."
 
 (defconst hproperty:color-list
   (if (memq window-system '(x gtk))
-      '( "red" "blue" "paleturquoise4" "mediumpurple2"
-"lightskyblue3" "springgreen2" "salmon" "yellowgreen" "darkorchid2"
-"aquamarine4" "slateblue4" "slateblue1" "olivedrab1" "goldenrod4"
-"goldenrod3" "cadetblue2" "burlywood1" "slategrey" "mistyrose"
-"limegreen" "lightcyan" "goldenrod" "gainsboro" "skyblue1" "honeydew"
-"yellow2" "tomato3" "skyblue" "purple4" "orange3" "bisque3" "bisque2"
-"grey34" "gray99" "gray63" "gray44" "gray37" "gray33" "gray26" "azure1"
-"snow4" "peru" "red" "lightgoldenrod4" "mediumseagreen" "blush"
-"mediumorchid2" "lightskyblue1" "darkslateblue" "midnightblue"
-"lightsalmon1" "lemonchiffon" "yellow" "lightsalmon" "coral"
-"dodgerblue3" "darkorange4" "blue" "royalblue4" "red" "green" "cyan"
-"darkviolet" "darksalmon" "darkorange" "blue" "pink" "magenta2"
-"sienna4" "khaki2" "grey75" "grey74" "grey73" "grey69" "grey68" "grey35"
-"grey13" "gray90" "gray81" "gray55" "gray51" "gray31" "snow2" "pink3"
-"grey7" "gray1" "red4" "red3" "tan" "red" "yellow" "mediumvioletred"
-"lightslategrey" "lavenderblush4" "turquoise" "darkturquoise"
-"darkslategrey" "lightskyblue" "lightsalmon4" "lightsalmon3"
-"forestgreen" "dodgerblue4" "orchid" "rosybrown4" "brown" "peachpuff3"
-"palegreen3" "orangered2" "rose" "lightcyan4" "indianred4" "indianred3"
-"seagreen2" "indianred" "deeppink1" "navyblue" "lavender" "grey"
-"deeppink" "salmon4" "salmon3" "oldlace" "grey78" "grey77" "grey54"
-"grey45" "grey21" "gray97" "gray96" "gray95" "gray88" "gray87" "gray86"
-"gray70" "gray57" "gray38" "gray12" "gray11" "plum3" "linen" "gray9"
-"gray8" "blue4" "beige" "turquoise" "blue" "lemonchiffon4"
-"darkseagreen1" "antiquewhite3" "mediumorchid" "springgreen"
-"turquoise4" "steelblue3" "mistyrose2" "lightcyan2" "red" "firebrick2"
-"royalblue" "cadetblue" "skyblue3" "yellow3" "salmon1" "orange4"
-"hotpink" "grey90" "gray56" "gray39" "gray18" "gray14" "plum4" "grey6"
-"gray6" "gold3" "gold1" "blue2" "tan2" "cyan" "mediumspringgreen"
-"darkolivegreen2" "goldenrod" "lightsteelblue" "brown" "whip"
-"chartreuse3" "violetred4" "royalblue2" "royalblue1" "papayawhip"
-"mistyrose3" "lightcyan1" "aquamarine" "skyblue4" "hotpink4" "hotpink3"
-"hotpink2" "dimgray" "tomato" "grey66" "grey65" "grey64" "grey33"
-"grey27" "gray76" "gray69" "gray68" "grey0" "azure" "green"
-"darkgoldenrod4" "darkgoldenrod3" "darkgoldenrod2" "darkgoldenrod"
-"brown" "lightsalmon2" "deepskyblue4" "deepskyblue3" "deepskyblue2"
-"deepskyblue" "darkorange1" "violetred3" "violetred2" "violetred1"
-"slateblue3" "slateblue2" "drab" "indianred1" "firebrick1" "cadetblue4"
-"violetred" "rosybrown" "blue" "firebrick" "grey100" "wheat4" "grey79"
-"grey76" "grey61" "gray93" "gray84" "gray65" "gray36" "gray32" "gray13"
-"gray10" "azure3" "snow1" "tan1" "gray" "darkolivegreen1" "blue"
-"almond" "lavenderblush3" "lavenderblush2" "lavenderblush1"
-"darkolivegreen" "lavenderblush" "aquamarine2" "red" "olivedrab2"
-"mistyrose4" "mistyrose1" "lightcyan3" "lightcoral" "chartreuse"
-"peachpuff" "palegreen" "mintcream" "skyblue2" "moccasin" "tomato1"
-"orchid3" "maroon3" "salmon" "grey81" "grey62" "grey39" "grey38"
-"grey37" "gray92" "gray83" "gray66" "gray54" "gray50" "gray30" "gray19"
-"gray15" "azure4" "grey3" "tan3" "pink" "gray" "blue" "lightsteelblue2"
-"lightsteelblue1" "green" "lightslategray" "lemonchiffon2"
-"springgreen1" "greenyellow" "chartreuse2" "grey" "royalblue3"
-"powderblue" "peachpuff2" "palegreen2" "cream" "slateblue" "seashell2"
-"deeppink2" "darkkhaki" "maroon4" "sienna" "grey71" "grey67" "grey18"
-"gray59" "gray43" "gray25" "bisque" "red1" "mediumslateblue"
-"lightgoldenrod1" "goldenrod" "paleturquoise3" "lightskyblue4" "green"
-"yellow" "smoke" "blue" "white" "steelblue4" "rosybrown3" "peachpuff1"
-"palegreen1" "blueviolet" "seashell4" "sienna3" "grey40" "gray91"
-"gray82" "gray5" "cyan2" "cyan1" "blue1" "snow" "lightgoldenrod2"
-"lightslateblue" "mediumorchid3" "darkseagreen4" "springgreen3" "green"
-"slategray4" "slategray3" "slategray2" "blue" "peachpuff4" "palegreen4"
-"green" "orangered3" "goldenrod1" "ghostwhite" "firebrick4" "firebrick3"
-"cadetblue3" "slategray" "seashell3" "honeydew3" "cornsilk4" "cornsilk2"
-"purple1" "dimgrey" "khaki1" "ivory3" "grey70" "grey60" "grey32"
-"grey22" "grey12" "gray98" "gray89" "gray71" "gray64" "gray60" "gray49"
-"azure2" "gray3" "paleturquoise1" "mediumpurple1" "purple"
-"lemonchiffon1" "blue" "navajowhite3" "darkorchid1" "orange"
-"goldenrod2" "khaki" "chocolate2" "burlywood2" "honeydew1" "darkgreen"
-"thistle3" "thistle2" "thistle1" "thistle" "maroon2" "maroon1" "grey53"
-"grey44" "grey25" "gray74" "gray45" "gray41" "gray35" "gray27" "gray23"
-"gray16" "brown4" "wheat" "coral" "tan4" "lightgoldenrodyellow" "blue"
-"green" "gray" "palevioletred3" "mediumpurple4" "mediumpurple3"
-"saddlebrown" "blue" "darkorchid4" "darkorchid3" "puff" "olivedrab4"
-"lightblue4" "lightpink" "lightgray" "honeydew2" "cornsilk1" "lace"
-"sienna1" "bisque4" "orchid" "khaki3" "grey84" "grey83" "grey82"
-"grey72" "grey52" "grey43" "grey26" "grey14" "grey10" "gray75" "gray53"
-"gray21" "gray20" "brown3" "grey8" "red2" "navy" "grey" "gold"
-"mediumaquamarine" "lightgoldenrod" "darkslategray4" "darkseagreen3"
-"darkseagreen2" "antiquewhite4" "white" "springgreen4" "lightyellow4"
-"white" "aquamarine1" "turquoise3" "steelblue2" "rosybrown2" "pink"
-"gray" "indianred2" "dodgerblue" "green" "seagreen1" "deeppink4"
-"aliceblue" "magenta1" "pink" "sienna2" "orchid1" "gray100" "grey97"
-"grey94" "grey87" "grey86" "grey51" "grey42" "grey19" "gray94" "gray85"
-"gray61" "brown2" "khaki" "grey1" "gold4" "blue" "green" "grey"
-"turquoise" "paleturquoise" "mediumorchid4" "antiquewhite2"
-"lightyellow2" "violet" "salmon" "chartreuse1" "turquoise1" "sandybrown"
-"orangered1" "lightpink1" "lightblue2" "lightblue1" "grey" "seagreen4"
-"seagreen3" "lightblue" "deeppink3" "burlywood" "seashell" "hotpink1"
-"gray" "yellow4" "yellow" "purple" "orange" "ivory4" "grey99" "grey89"
-"grey63" "grey58" "grey49" "grey31" "grey24" "grey20" "green4" "green1"
-"gray73" "gray67" "coral3" "coral2" "plum2" "pink4" "ivory" "gray4"
-"gray2" "gold2" "aquamarine" "grey" "lightgoldenrod3" "darkolivegreen3"
-"darkgoldenrod1" "goldenrod" "orchid" "chiffon" "navajowhite4"
-"deepskyblue1" "lightyellow" "floralwhite" "blue" "mediumblue"
-"chocolate4" "chocolate3" "burlywood4" "turquoise" "steelblue" "green"
-"lawngreen" "honeydew4" "seagreen" "orchid4" "wheat1" "violet" "ivory1"
-"grey88" "grey85" "grey57" "grey56" "grey55" "grey48" "grey47" "grey46"
-"grey30" "grey17" "gray47" "gray29" "pink2" "grey5" "grey4" "green"
-"gray0" "brown" "lightsteelblue4" "darkolivegreen4" "palevioletred4"
-"blue" "darkslategray3" "darkslategray2" "darkslategray1"
-"blanchedalmond" "palegoldenrod" "blue" "lightseagreen" "lemonchiffon3"
-"darkslategray" "green" "darkseagreen" "antiquewhite" "darkorange2"
-"chartreuse4" "blue" "rosybrown1" "olivedrab3" "lightpink2" "orangered"
-"thistle4" "blue" "cornsilk" "salmon2" "orchid2" "ivory2" "grey93"
-"grey92" "grey91" "grey36" "grey29" "grey28" "grey16" "gray79" "gray78"
-"gray77" "gray48" "gray17" "coral4" "coral1" "plum1" "pink1" "grey9"
-"grey2" "gray7" "cyan4" "blue3" "plum" "cornflowerblue" "lightskyblue2"
-"antiquewhite1" "navajowhite2" "navajowhite1" "lightyellow3"
-"navajowhite" "darkorange3" "whitesmoke" "turquoise2" "steelblue1"
-"lightpink4" "lightblue3" "green" "chocolate1" "blue" "olivedrab"
-"lightgrey" "chocolate" "magenta4" "magenta3" "yellow1" "purple3"
-"purple2" "orange2" "orange1" "magenta" "bisque1" "wheat2" "maroon"
-"khaki4" "grey96" "grey95" "grey80" "grey50" "grey41" "grey15" "grey11"
-"gray80" "gray58" "gray40" "gray34" "gray22" "brown1" "snow3"
-"mediumturquoise" "lightsteelblue3" "palevioletred2" "palevioletred1"
-"paleturquoise2" "green" "palevioletred" "mediumorchid1" "white"
-"mediumpurple" "lightyellow1" "dodgerblue2" "dodgerblue1" "violet"
-"aquamarine3" "slategray1" "gray" "orangered4" "lightpink3" "blue"
-"darkorchid" "cadetblue1" "burlywood3" "seashell1" "cornsilk3" "tomato4"
-"tomato2" "wheat3" "grey98" "grey59" "grey23" "green3" "green2" "gray72"
-"gray62" "gray52" "gray46" "gray42" "gray28" "gray24" "white" "cyan3"
-"black" )
-    '("Red" "Blue" "Purple" "Magenta" "Orange" "Yellow" "Green" "Brown"
-      "Dark Gray" "Light Gray" "Black" "Cyan")
-    ))
-
+      (defined-colors)))
 
 (defvar hproperty:color-ptr nil
   "Pointer to current color name table to use for Hyperbole buttons.")
@@ -332,22 +192,9 @@ highlighted."
     (when color (setq hproperty:color-ptr nil))
     (set-face-foreground
      hproperty:but-face (or color (car (hproperty:list-cycle 
hproperty:color-ptr hproperty:good-colors))))
-    (hproperty:set-flash-color)
     (redisplay t)
     t))
 
-(defun hproperty:set-flash-color ()
-  "Set button flashing colors based upon current color set."
-  (when (display-color-p)
-    (set-face-foreground hproperty:flash-face
-                        (if (and hproperty:but-face (face-background 
hproperty:but-face))
-                            (face-background hproperty:but-face)
-                          (hproperty:background)))
-    (set-face-background hproperty:flash-face
-                        (if (and hproperty:but-face (face-foreground 
hproperty:but-face))
-                            (face-foreground hproperty:but-face)
-                          (hproperty:but-color)))))
-
 (defun hproperty:but-p (&optional pos)
   "Return non-nil at point or optional POS iff face is eq to 
hproperty:but-face."
   (memq t (mapcar (lambda (props)
@@ -379,35 +226,6 @@ highlighted."
        (redisplay t)))
     (and ibut (not prev) (hproperty:but-delete start))))
 
-(defun hproperty:set-item-highlight (&optional background foreground)
-  "Setup or reset item highlight face using optional BACKGROUND and 
FOREGROUND."
-  (make-local-variable 'hproperty:item-face)
-  (when (stringp background) (setq hproperty:item-highlight-color background))
-  (unless hproperty:highlight-face
-    (set-face-foreground hproperty:highlight-face (or foreground
-                                                     (hproperty:background)))
-    (set-face-underline hproperty:highlight-face nil))
-
-  (let ((update-hyrolo-highlight-flag
-        (and (boundp 'hyrolo-highlight-face)
-             (or (and (fboundp 'facep) (facep hyrolo-highlight-face))
-                 (and (fboundp 'internal-facep) (internal-facep 
hyrolo-highlight-face)))
-             (or (null (face-foreground hyrolo-highlight-face))
-                 (face-equal hproperty:highlight-face 
hyrolo-highlight-face)))))
-    (unless (equal (face-background hproperty:highlight-face)
-                  hproperty:item-highlight-color)
-       (set-face-background hproperty:highlight-face
-                            hproperty:item-highlight-color))
-    (and background (not (equal (face-background
-                                hproperty:highlight-face) background))
-        (set-face-background hproperty:highlight-face background))
-    (and foreground (not (equal (face-foreground
-                                hproperty:highlight-face) foreground))
-        (set-face-foreground hproperty:highlight-face foreground))
-    (setq hproperty:item-face hproperty:highlight-face)
-    (if update-hyrolo-highlight-flag
-       (copy-face hproperty:highlight-face hyrolo-highlight-face))))
-
 (defun hproperty:select-item (&optional pnt)
   "Select item in current buffer at optional position PNT using 
hproperty:item-face."
   (when pnt (goto-char pnt))
@@ -438,28 +256,6 @@ highlighted."
   "Hyperbole hyper-button face.")
 (setq hproperty:but hproperty:but-face)
 
-(defun hproperty:set-face-after-init ()
-  "Hyperbole button and highlighting face initializations; must be invoked 
after customizations are loaded."
-  (when (featurep 'hui-em-but)
-    (when (or (not hproperty:but-face)
-             (and (equal (face-background hproperty:but-face) 
(hproperty:background))
-                  (member (face-foreground hproperty:but-face) (list 
(hproperty:foreground)
-                                                                     
(hproperty:but-color)))))
-      (set-face-foreground hproperty:but-face (hproperty:but-color))
-      (set-face-background hproperty:but-face (hproperty:background)))
-    (when (or (not hproperty:highlight-face)
-             (and (equal (face-background hproperty:highlight-face) 
(hproperty:background))
-                  (equal (face-foreground hproperty:highlight-face) 
(hproperty:foreground))))
-      ;; Reverse foreground and background colors for default block-style 
highlighting.
-      (hproperty:set-item-highlight (hproperty:foreground) 
(hproperty:background)))
-    (when (and (member (face-background hproperty:flash-face)
-                      (list (face-background hproperty:but-face)
-                            (hproperty:background)))
-              (member (face-foreground hproperty:flash-face)
-                      (list (face-foreground hproperty:but-face)
-                            (hproperty:foreground))))
-      (hproperty:set-flash-color))))
-
 (defvar hproperty:item-button nil
   "Button used to highlight an item in a listing buffer.")
 (make-variable-buffer-local 'hproperty:item-button)
@@ -467,11 +263,4 @@ highlighted."
 
 (provide 'hui-em-but)
 
-(if after-init-time
-    (progn
-      ;; Reverse foreground and background colors for default block-style 
highlighting.
-      (hproperty:set-item-highlight (hproperty:foreground) 
(hproperty:background))
-      (hproperty:set-face-after-init))
-  (add-hook 'after-init-hook #'hproperty:set-face-after-init))
-
 ;;; hui-em-but.el ends here
diff --git a/hyrolo.el b/hyrolo.el
index 9d82e7e..b63daf6 100644
--- a/hyrolo.el
+++ b/hyrolo.el
@@ -105,26 +105,12 @@ A hyrolo-file consists of:
    (2) one or more rolo entries which each begin with
        hyrolo-entry-regexp and may be nested.")
 
-(defcustom hyrolo-highlight-face nil
+(defcustom hyrolo-highlight-face 'match
   "*Face used to highlight rolo search matches."
   :type 'face
   :initialize #'custom-initialize-default
   :group 'hyperbole-rolo)
 
-(defun hyrolo-initialize-highlight-face ()
-  "Define the face stored in `hyrolo-highlight-face'."
-  (unless (and (boundp 'hyrolo-highlight-face) hyrolo-highlight-face)
-    (setq hyrolo-highlight-face
-         (when (fboundp 'defface)
-           (defface hyrolo-highlight-face nil
-             "*Face used to highlight rolo search matches."
-             :group 'hyperbole-rolo)))
-    (when (fboundp 'hproperty:set-item-highlight)
-      (hproperty:set-item-highlight))))
-
-(unless hyrolo-highlight-face
-  (hyrolo-initialize-highlight-face))
-
 (defcustom hyrolo-kill-buffers-after-use nil
   "*Non-nil means kill rolo file buffers after searching them for entries.
 Only unmodified buffers are killed."