diff options
| author | Karoly Lorentey | 2005-02-20 18:47:54 +0000 |
|---|---|---|
| committer | Karoly Lorentey | 2005-02-20 18:47:54 +0000 |
| commit | b5d78df397f8cdcd20f3bcfbed2eb71d522abddd (patch) | |
| tree | cedfc1db69595526c12da068ea7ff5bdf3b806f2 /lisp/faces.el | |
| parent | 60c73d2ed638e5d51643c65a0fc6dea618fc72c8 (diff) | |
| parent | eedeacb3074baad8ce752a506f9f435c98e42ff4 (diff) | |
| download | emacs-b5d78df397f8cdcd20f3bcfbed2eb71d522abddd.tar.gz emacs-b5d78df397f8cdcd20f3bcfbed2eb71d522abddd.zip | |
Merged from miles@gnu.org--gnu-2005 (patch 17-26, 107-116)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-107
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-108
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-109
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-110
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-111
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-112
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-113
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-114
<no summary provided>
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-115
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-116
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-17
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-18
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-19
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-20
Merge from emacs--cvs-trunk--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-21
More work on moving images to etc/images
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-22
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-23
Fix errors with image-file installation
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-24
etc/Makefile.in (install): Put gnus-tut.txt in the right place.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-25
etc/Makefile.in (install, uninstall): Fix installed image dirs.
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-26
etc/Makefile.in (install): Create $(etcdir)/images/gnus dir.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-296
Diffstat (limited to 'lisp/faces.el')
| -rw-r--r-- | lisp/faces.el | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/faces.el b/lisp/faces.el index cc6b5d0f8df..936e0a132a4 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -1910,6 +1910,9 @@ created." | |||
| 1910 | 1910 | ||
| 1911 | 1911 | ||
| 1912 | (defface minibuffer-prompt '((((background dark)) :foreground "cyan") | 1912 | (defface minibuffer-prompt '((((background dark)) :foreground "cyan") |
| 1913 | ;; Don't use blue because many users of | ||
| 1914 | ;; the MS-DOS port customize their | ||
| 1915 | ;; foreground color to be blue. | ||
| 1913 | (((type pc)) :foreground "magenta") | 1916 | (((type pc)) :foreground "magenta") |
| 1914 | (t :foreground "dark blue")) | 1917 | (t :foreground "dark blue")) |
| 1915 | "Face for minibuffer prompts." | 1918 | "Face for minibuffer prompts." |
| @@ -2077,6 +2080,8 @@ Note: Other faces cannot inherit from the cursor face." | |||
| 2077 | :group 'basic-faces) | 2080 | :group 'basic-faces) |
| 2078 | 2081 | ||
| 2079 | (defface escape-glyph '((((background dark)) :foreground "cyan") | 2082 | (defface escape-glyph '((((background dark)) :foreground "cyan") |
| 2083 | ;; See the comment in minibuffer-prompt for | ||
| 2084 | ;; the reason not to use blue on MS-DOS. | ||
| 2080 | (((type pc)) :foreground "magenta") | 2085 | (((type pc)) :foreground "magenta") |
| 2081 | (t :foreground "blue")) | 2086 | (t :foreground "blue")) |
| 2082 | "Face for characters displayed as ^-sequences or \-sequences." | 2087 | "Face for characters displayed as ^-sequences or \-sequences." |