Commit 5205d6f6 authored by Chong Yidong's avatar Chong Yidong

Fix legibility of compilation mode-line messages.

* lisp/progmodes/compile.el (compilation-mode-line-fail)
(compilation-mode-line-run, compilation-mode-line-exit): New
faces.
(compilation-start, compilation-handle-exit): Use them.

* etc/themes/wheatgrass-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/tsdh-dark-theme.el: Add compilation-mode-line-fail,
compilation-mode-line-run, and compilation-mode-line-exit faces.

* etc/themes/manoj-dark-theme.el: Remove :family attributes.

Fixes: debbugs:11032
parent 757ee657
2012-06-03 Chong Yidong <cyd@gnu.org>
* themes/wheatgrass-theme.el:
* themes/deeper-blue-theme.el:
* themes/tango-dark-theme.el:
* themes/tsdh-dark-theme.el: Add compilation-mode-line-fail,
compilation-mode-line-run, and compilation-mode-line-exit faces.
* themes/manoj-dark-theme.el: Remove :family attributes.
2012-06-01 Paul Eggert <eggert@cs.ucla.edu>
Remove --disable-maintainer-mode option from 'configure'. (Bug#11555)
......
......@@ -35,6 +35,7 @@
`(compilation-error ((,class (:foreground "Red1"))))
`(compilation-info ((,class (:weight normal :foreground "LightSkyBlue"))))
`(compilation-line-number ((,class (:foreground "LightGreen"))))
`(compilation-mode-line-exit ((,class (:foreground "blue4"))))
`(cperl-array-face ((,class (:foreground "yellow2"))))
`(cperl-hash-face ((,class (:foreground "coral1"))))
`(cursor ((,class (:background "green"))))
......
......@@ -307,7 +307,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(org-agenda-structure ((t (:foreground "LightSkyBlue"))))
'(org-archived ((t (:foreground "grey70"))))
'(org-code ((t (:foreground "grey70"))))
'(org-column ((t (:background "grey30" :slant normal :weight normal :height 81 :family "unknown-DejaVu Sans Mono"))))
'(org-column ((t (:background "grey30" :slant normal :weight normal :height 81))))
'(org-column-title ((t (:bold t :background "grey30" :underline t :weight bold))))
'(org-date ((t (:foreground "Cyan" :underline t))))
'(org-done ((t (:bold t :foreground "PaleGreen" :weight bold))))
......@@ -352,10 +352,10 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(CUA-global-mark-face ((t (:background "cyan" :foreground "black"))))
'(CUA-rectangle-face ((t (:background "maroon" :foreground "white"))))
'(CUA-rectangle-noselect-face ((t (:background "dimgray" :foreground "white"))))
'(Info-title-1-face ((t (:bold t :weight bold :family "helv" :height 1.728))))
'(Info-title-2-face ((t (:bold t :family "helv" :weight bold :height 1.44))))
'(Info-title-3-face ((t (:bold t :weight bold :family "helv" :height 1.2))))
'(Info-title-4-face ((t (:bold t :family "helv" :weight bold))))
'(Info-title-1-face ((t (:bold t :weight bold :height 1.728))))
'(Info-title-2-face ((t (:bold t :weight bold :height 1.44))))
'(Info-title-3-face ((t (:bold t :weight bold :height 1.2))))
'(Info-title-4-face ((t (:bold t :weight bold))))
'(align-highlight-nochange-face ((t (:background "SkyBlue4"))))
'(antlr-font-lock-keyword-face ((t (:foreground "SteelBlue")))) ;%
......@@ -383,7 +383,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(change-log-conditionals-face ((t (:foreground "Aquamarine"))))
'(change-log-date-face ((t (:italic t :slant oblique :foreground "BurlyWood"))))
'(change-log-email-face ((t (:foreground "Aquamarine"))))
'(change-log-file-face ((t (:bold t :family "Verdana" :weight bold :foreground "LightSkyBlue" :height 0.9))))
'(change-log-file-face ((t (:bold t :weight bold :foreground "LightSkyBlue" :height 0.9))))
'(change-log-function-face ((t (:foreground "Aquamarine"))))
'(change-log-list-face ((t (:foreground "LightSkyBlue"))))
'(change-log-name-face ((t (:bold t :weight bold :foreground "Gold"))))
......@@ -397,10 +397,9 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(compilation-message-face ((t (:underline t))))
'(compilation-warning ((t (:bold t :foreground "Orange" :weight bold))))
'(compilation-warning-face ((t (:bold t :foreground "Orange" :weight bold))))
'(completions-common-part ((t (:family "unknown-DejaVu Sans Mono"
:width normal :weight normal
:slant normal :foreground "WhiteSmoke"
:background "black" :height 81))))
'(completions-common-part ((t (:width normal :weight normal
:slant normal :foreground "WhiteSmoke"
:background "black" :height 81))))
'(completions-first-difference ((t (:bold t :weight bold))))
'(css-selector ((t (:foreground "LightSteelBlue"))))
......@@ -415,9 +414,9 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(custom-changed-face ((t (:foreground "wheat" :background "blue"))))
'(custom-comment-face ((t (:background "dim gray"))))
'(custom-comment-tag-face ((t (:foreground "gray80"))))
'(custom-face-tag-face ((t (:bold t :family "helv" :weight bold :height 1.1))))
'(custom-group-tag-face ((t (:bold t :family "helv" :foreground "light blue" :weight bold :height 1.1))))
'(custom-group-tag-face-1 ((t (:bold t :family "helv" :foreground "pink" :weight bold :height 1.1))))
'(custom-face-tag-face ((t (:bold t :weight bold :height 1.1))))
'(custom-group-tag-face ((t (:bold t :foreground "light blue" :weight bold :height 1.1))))
'(custom-group-tag-face-1 ((t (:bold t :foreground "pink" :weight bold :height 1.1))))
'(custom-invalid-face ((t (:background "red" :foreground "yellow"))))
'(custom-modified-face ((t (:background "blue" :foreground "white"))))
'(custom-rogue-face ((t (:background "black" :foreground "pink"))))
......@@ -428,9 +427,8 @@ jarring angry fruit salad look to reduce eye fatigue.")
:background "lightgrey"
:foreground "black"
:box '(:line-width 2 :style released-button)))))
'(custom-variable-tag-face ((t (:bold t :family "helv"
:foreground "light blue"
:weight bold :height 1.2))))
'(custom-variable-tag-face ((t (:bold t :foreground "light blue"
:weight bold :height 1.2))))
'(diary ((t (:foreground "IndianRed"))))
'(diary-anniversary ((t (:foreground "Cyan1"))))
......@@ -505,7 +503,6 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(excerpt ((t (:italic t))))
'(file-name-shadow ((t (:foreground "grey70"))))
'(fixed ((t (:bold t))))
'(fixed-pitch ((t (:family "courier"))))
'(flyspell-duplicate-face ((t (:foreground "IndianRed" :bold t :underline t))))
'(flyspell-incorrect-face ((t (:foreground "Pink" :bold t :underline t))))
......@@ -543,7 +540,7 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(ido-only-match ((t (:foreground "ForestGreen"))))
'(ido-subdir ((t (:foreground "red1"))))
'(info-menu-5 ((t (:underline t))))
'(info-menu-header ((t (:bold t :family "helv" :weight bold))))
'(info-menu-header ((t (:bold t :weight bold))))
'(info-node ((t (:bold t :italic t :foreground "yellow"))))
'(info-node ((t (:italic t :bold t :foreground "white" :slant italic :weight bold))))
'(info-xref ((t (:bold t :foreground "DodgerBlue1"))))
......@@ -638,10 +635,9 @@ jarring angry fruit salad look to reduce eye fatigue.")
'(table-cell ((t (:background "blue1" :foreground "gray90"))))
'(tool-bar ((t (:background "grey75" :foreground "black" :box (:line-width 1 :style released-button)))))
'(tooltip ((t (:family "helv" :background "lightyellow" :foreground "black"))))
'(tooltip ((t (:background "lightyellow" :foreground "black"))))
'(trailing-whitespace ((t (:background "red1"))))
'(underline ((t (:underline t))))
'(variable-pitch ((t (:family "helv"))))
'(vcursor ((t (:foreground "blue" :background "cyan" :underline t))))
'(vertical-border ((t (:background "dim gray"))))
'(vhdl-font-lock-attribute-face ((t (:foreground "Orchid"))))
......
......@@ -72,6 +72,9 @@ Semantic, and Ansi-Color faces are included.")
`(mode-line-inactive ((,class
(:box (:line-width -1 :style released-button)
:background ,alum-5 :foreground ,alum-1))))
`(compilation-mode-line-fail ((,class (:foreground ,red-3))))
`(compilation-mode-line-run ((,class (:foreground ,orange-3))))
`(compilation-mode-line-exit ((,class (:foreground ,cham-3))))
;; Escape and prompt faces
`(minibuffer-prompt ((,class (:foreground ,cham-0))))
`(escape-glyph ((,class (:foreground ,butter-3))))
......
......@@ -26,6 +26,9 @@ Used and created by Tassilo Horn.")
(custom-theme-set-faces
'tsdh-dark
'(default ((t (:background "gray20" :foreground "white smoke"))))
'(compilation-mode-line-fail ((t (:foreground "red"))))
'(compilation-mode-line-run ((t (:foreground "dark orange"))))
'(compilation-mode-line-exit ((t (:foreground "sea green"))))
'(diff-added ((t (:inherit diff-changed :background "dark green"))))
'(diff-changed ((t (:background "midnight blue"))))
'(diff-indicator-added ((t (:inherit diff-indicator-changed))))
......@@ -40,7 +43,7 @@ Used and created by Tassilo Horn.")
'(message-header-subject ((t (:foreground "SkyBlue"))))
'(minibuffer-prompt ((t (:background "yellow" :foreground "medium blue" :box (:line-width -1 :color "red" :style released-button) :weight bold))))
'(mode-line ((t (:box (:line-width -1 :color "red" :style released-button) :family "DejaVu Sans"))))
'(mode-line-inactive ((t (:inherit mode-line :foreground "dim gray"))))
'(mode-line-inactive ((t (:inherit mode-line :foreground "gray"))))
'(org-agenda-date ((t (:inherit org-agenda-structure))))
'(org-agenda-date-today ((t (:inherit org-agenda-date :underline t))))
'(org-agenda-date-weekend ((t (:inherit org-agenda-date :foreground "dark green"))))
......
......@@ -33,6 +33,10 @@ of green, brown, and blue.")
`(error ((,class (:foreground "salmon1"))))
`(warning ((,class (:foreground "orange"))))
`(success ((,class (:foreground "yellow green"))))
;; Compilation faces
`(compilation-mode-line-fail ((,class (:foreground "dark green"))))
`(compilation-mode-line-run ((,class (:foreground "dark goldenrod"))))
`(compilation-mode-line-exit ((,class (:foreground "SpringGreen4"))))
;; Highlighting faces
`(highlight ((,class (:foreground "white" :background "dark green"))))
`(region ((,class (:foreground "white" :background "dark green"))))
......
2012-06-03 Chong Yidong <cyd@gnu.org>
* progmodes/compile.el (compilation-mode-line-fail)
(compilation-mode-line-run, compilation-mode-line-exit): New
faces.
(compilation-start, compilation-handle-exit): Use them (Bug#11032).
2012-06-03 Jack Duthen <duthen.mac.01@gmail.com> (tiny change)
* progmodes/which-func.el (which-func-update-ediff-windows): New
......
......@@ -674,6 +674,34 @@ starting the compilation process."
:group 'compilation
:version "22.1")
;; The next three faces must be able to stand out against the
;; `mode-line' and `mode-line-inactive' faces.
(defface compilation-mode-line-fail
'((default :inherit compilation-error)
(((class color) (min-colors 16)) (:foreground "Red1" :weight bold))
(((class color) (min-colors 8)) (:foreground "red"))
(t (:inverse-video t :weight bold)))
"Face for Compilation mode's \"error\" mode line indicator."
:group 'compilation
:version "24.2")
(defface compilation-mode-line-run
'((t :inherit compilation-warning))
"Face for Compilation mode's \"running\" mode line indicator."
:group 'compilation
:version "24.2")
(defface compilation-mode-line-exit
'((default :inherit compilation-info)
(((class color) (min-colors 16))
(:foreground "ForestGreen" :weight bold))
(((class color)) (:foreground "green" :weight bold))
(t (:weight bold)))
"Face for Compilation mode's \"exit\" mode line indicator."
:group 'compilation
:version "24.2")
(defface compilation-line-number
'((t :inherit font-lock-keyword-face))
"Face for displaying line numbers in compiler messages."
......@@ -1626,7 +1654,7 @@ Returns the compilation buffer created."
outbuf command))))
;; Make the buffer's mode line show process state.
(setq mode-line-process
(list (propertize ":%s" 'face 'compilation-warning)))
'(:propertize ":%s" face compilation-mode-line-run))
(set-process-sentinel proc 'compilation-sentinel)
(unless (eq mode t)
;; Keep the comint filter, since it's needed for proper handling
......@@ -1648,7 +1676,7 @@ Returns the compilation buffer created."
(message "Executing `%s'..." command)
;; Fake mode line display as if `start-process' were run.
(setq mode-line-process
(list (propertize ":run" 'face 'compilation-warning)))
'(:propertize ":run" face compilation-mode-line-run))
(force-mode-line-update)
(sit-for 0) ; Force redisplay
(save-excursion
......@@ -2046,9 +2074,10 @@ commands of Compilation major mode are available. See
(car status)))))
(message "%s" msg)
(propertize out-string
'help-echo msg 'face (if (> exit-status 0)
'compilation-error
'compilation-info))))
'help-echo msg
'face (if (> exit-status 0)
'compilation-mode-line-fail
'compilation-mode-line-exit))))
;; Force mode line redisplay soon.
(force-mode-line-update)
(if (and opoint (< opoint omax))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment