diff options
| author | Chong Yidong | 2012-06-03 22:37:13 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-06-03 22:37:13 +0800 |
| commit | 5205d6f6a86e410758bd081949657ad5e97bb240 (patch) | |
| tree | f6c6ababde42ef3c1459cf649ec6906d3b01fe6c /lisp | |
| parent | 757ee65741cc9400314f0a2cc3f83f87c21c79e6 (diff) | |
| download | emacs-5205d6f6a86e410758bd081949657ad5e97bb240.tar.gz emacs-5205d6f6a86e410758bd081949657ad5e97bb240.zip | |
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
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/progmodes/compile.el | 39 |
2 files changed, 41 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4794fbe2595..5a8644b81ff 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-06-03 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/compile.el (compilation-mode-line-fail) | ||
| 4 | (compilation-mode-line-run, compilation-mode-line-exit): New | ||
| 5 | faces. | ||
| 6 | (compilation-start, compilation-handle-exit): Use them (Bug#11032). | ||
| 7 | |||
| 1 | 2012-06-03 Jack Duthen <duthen.mac.01@gmail.com> (tiny change) | 8 | 2012-06-03 Jack Duthen <duthen.mac.01@gmail.com> (tiny change) |
| 2 | 9 | ||
| 3 | * progmodes/which-func.el (which-func-update-ediff-windows): New | 10 | * progmodes/which-func.el (which-func-update-ediff-windows): New |
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index 5c9d5c7e351..61dc371c087 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el | |||
| @@ -674,6 +674,34 @@ starting the compilation process." | |||
| 674 | :group 'compilation | 674 | :group 'compilation |
| 675 | :version "22.1") | 675 | :version "22.1") |
| 676 | 676 | ||
| 677 | ;; The next three faces must be able to stand out against the | ||
| 678 | ;; `mode-line' and `mode-line-inactive' faces. | ||
| 679 | |||
| 680 | (defface compilation-mode-line-fail | ||
| 681 | '((default :inherit compilation-error) | ||
| 682 | (((class color) (min-colors 16)) (:foreground "Red1" :weight bold)) | ||
| 683 | (((class color) (min-colors 8)) (:foreground "red")) | ||
| 684 | (t (:inverse-video t :weight bold))) | ||
| 685 | "Face for Compilation mode's \"error\" mode line indicator." | ||
| 686 | :group 'compilation | ||
| 687 | :version "24.2") | ||
| 688 | |||
| 689 | (defface compilation-mode-line-run | ||
| 690 | '((t :inherit compilation-warning)) | ||
| 691 | "Face for Compilation mode's \"running\" mode line indicator." | ||
| 692 | :group 'compilation | ||
| 693 | :version "24.2") | ||
| 694 | |||
| 695 | (defface compilation-mode-line-exit | ||
| 696 | '((default :inherit compilation-info) | ||
| 697 | (((class color) (min-colors 16)) | ||
| 698 | (:foreground "ForestGreen" :weight bold)) | ||
| 699 | (((class color)) (:foreground "green" :weight bold)) | ||
| 700 | (t (:weight bold))) | ||
| 701 | "Face for Compilation mode's \"exit\" mode line indicator." | ||
| 702 | :group 'compilation | ||
| 703 | :version "24.2") | ||
| 704 | |||
| 677 | (defface compilation-line-number | 705 | (defface compilation-line-number |
| 678 | '((t :inherit font-lock-keyword-face)) | 706 | '((t :inherit font-lock-keyword-face)) |
| 679 | "Face for displaying line numbers in compiler messages." | 707 | "Face for displaying line numbers in compiler messages." |
| @@ -1626,7 +1654,7 @@ Returns the compilation buffer created." | |||
| 1626 | outbuf command)))) | 1654 | outbuf command)))) |
| 1627 | ;; Make the buffer's mode line show process state. | 1655 | ;; Make the buffer's mode line show process state. |
| 1628 | (setq mode-line-process | 1656 | (setq mode-line-process |
| 1629 | (list (propertize ":%s" 'face 'compilation-warning))) | 1657 | '(:propertize ":%s" face compilation-mode-line-run)) |
| 1630 | (set-process-sentinel proc 'compilation-sentinel) | 1658 | (set-process-sentinel proc 'compilation-sentinel) |
| 1631 | (unless (eq mode t) | 1659 | (unless (eq mode t) |
| 1632 | ;; Keep the comint filter, since it's needed for proper handling | 1660 | ;; Keep the comint filter, since it's needed for proper handling |
| @@ -1648,7 +1676,7 @@ Returns the compilation buffer created." | |||
| 1648 | (message "Executing `%s'..." command) | 1676 | (message "Executing `%s'..." command) |
| 1649 | ;; Fake mode line display as if `start-process' were run. | 1677 | ;; Fake mode line display as if `start-process' were run. |
| 1650 | (setq mode-line-process | 1678 | (setq mode-line-process |
| 1651 | (list (propertize ":run" 'face 'compilation-warning))) | 1679 | '(:propertize ":run" face compilation-mode-line-run)) |
| 1652 | (force-mode-line-update) | 1680 | (force-mode-line-update) |
| 1653 | (sit-for 0) ; Force redisplay | 1681 | (sit-for 0) ; Force redisplay |
| 1654 | (save-excursion | 1682 | (save-excursion |
| @@ -2046,9 +2074,10 @@ commands of Compilation major mode are available. See | |||
| 2046 | (car status))))) | 2074 | (car status))))) |
| 2047 | (message "%s" msg) | 2075 | (message "%s" msg) |
| 2048 | (propertize out-string | 2076 | (propertize out-string |
| 2049 | 'help-echo msg 'face (if (> exit-status 0) | 2077 | 'help-echo msg |
| 2050 | 'compilation-error | 2078 | 'face (if (> exit-status 0) |
| 2051 | 'compilation-info)))) | 2079 | 'compilation-mode-line-fail |
| 2080 | 'compilation-mode-line-exit)))) | ||
| 2052 | ;; Force mode line redisplay soon. | 2081 | ;; Force mode line redisplay soon. |
| 2053 | (force-mode-line-update) | 2082 | (force-mode-line-update) |
| 2054 | (if (and opoint (< opoint omax)) | 2083 | (if (and opoint (< opoint omax)) |