diff options
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index 4c058ba1fd3..904db10efa5 100644 --- a/lisp/faces.el +++ b/lisp/faces.el @@ -1805,7 +1805,11 @@ Initialize colors of certain faces from frame parameters." (face-spec-set face (face-user-default-spec face) frame) (internal-merge-in-global-face face frame) (if (memq (window-system frame) '(x w32 mac)) - (make-face-x-resource-internal face frame))) + (make-face-x-resource-internal face frame)) + ;; If the user has customized the face, don't let X + ;; resources override the customizations. + (if (get face 'theme-face) + (custom-theme-recalc-face face))) (error nil))) ;; Apply the attributes specified by frame parameters. This ;; rewrites parameters changed by make-face-x-resource-internal @@ -2195,18 +2199,12 @@ terminal type to a different value." :version "22.1" :group 'basic-faces) -(defface momentary - '((t (:inherit mode-line))) - "Face for momentarily displaying text in the current buffer." - :version "22.1" - :group 'basic-faces) - (defface minibuffer-prompt '((((background dark)) :foreground "cyan") ;; Don't use blue because many users of the MS-DOS port customize ;; their foreground color to be blue. (((type pc)) :foreground "magenta") - (t :foreground "dark blue")) + (t :foreground "medium blue")) "Face for minibuffer prompts. By default, Emacs automatically adds this face to the value of `minibuffer-prompt-properties', which is a list of text properties |