diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-01-31 22:34:48 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-01-31 22:34:48 -0700 |
commit | d4d613629b59d2eadd80026cab6c9dabc92cab24 (patch) | |
tree | d31086a817251dddb847d027661d218c1ecd6540 /lisp/faces.el | |
parent | fdb813e529602914360fc2d0cf22e42e32e6905f (diff) | |
parent | a5438ee11ad052e71334dcfb2db51fb9123411e5 (diff) | |
download | emacs-d4d613629b59d2eadd80026cab6c9dabc92cab24.tar.gz |
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to 'lisp/faces.el')
-rw-r--r-- | lisp/faces.el | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 4e98338432f..90f11bbe3bb 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -2199,7 +2199,7 @@ the above example." (not (funcall pred type))) ;; Strip off last hyphen and what follows, then try again (setq type - (if (setq hyphend (string-match-p "[-_][^-_]+$" type)) + (if (setq hyphend (string-match-p "[-_.][^-_.]+$" type)) (substring type 0 hyphend) nil)))) type) @@ -2683,11 +2683,20 @@ the same as `window-divider' face." (defface internal-border '((t nil)) - "Basic face for the internal border." + "Basic face for the internal border. +For the internal border of child frames see `child-frame-border'." :version "26.1" :group 'frames :group 'basic-faces) +(defface child-frame-border + '((t nil)) + "Basic face for the internal border of child frames. +For the internal border of non-child frames see `internal-border'." + :version "28.1" + :group 'frames + :group 'basic-faces) + (defface minibuffer-prompt '((((background dark)) :foreground "cyan") ;; Don't use blue because many users of the MS-DOS port customize |