Mercurial > emacs
comparison lisp/faces.el @ 83206:b5dee7c1d483
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-547
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-548
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-549
Use symbol-matching for generic-mode keywords
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-550
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-551
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-246
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Thu, 16 Sep 2004 13:09:53 +0000 |
parents | fe5ecb72e304 8f14c8ea51a1 |
children | 549734260e34 |
comparison
equal
deleted
inserted
replaced
83205:400c4dd06d55 | 83206:b5dee7c1d483 |
---|---|
1952 :group 'frames | 1952 :group 'frames |
1953 :group 'basic-faces) | 1953 :group 'basic-faces) |
1954 | 1954 |
1955 | 1955 |
1956 (defface cursor '() | 1956 (defface cursor '() |
1957 "Basic face for the cursor color under X." | 1957 "Basic face for the cursor color under X. |
1958 Note: Other faces cannot inherit from the cursor face." | |
1958 :version "21.1" | 1959 :version "21.1" |
1959 :group 'cursor | 1960 :group 'cursor |
1960 :group 'basic-faces) | 1961 :group 'basic-faces) |
1961 | 1962 |
1963 (put 'cursor 'face-no-inherit t) | |
1962 | 1964 |
1963 (defface mouse '() | 1965 (defface mouse '() |
1964 "Basic face for the mouse color under X." | 1966 "Basic face for the mouse color under X." |
1965 :version "21.1" | 1967 :version "21.1" |
1966 :group 'mouse | 1968 :group 'mouse |