diff options
author | Karoly Lorentey <lorentey@elte.hu> | 2005-05-20 17:44:36 +0000 |
---|---|---|
committer | Karoly Lorentey <lorentey@elte.hu> | 2005-05-20 17:44:36 +0000 |
commit | b4bb3cbc7caca5c9c207d9ed42cacb978790af67 (patch) | |
tree | 6d347dbb4b2db074171d0bbcb89afe851cffe85b /lisp/frame.el | |
parent | 35bc5d82600f330082298823f09f53259a90ea81 (diff) | |
parent | a18ff9886771c41186eebf8d7984fee2120dbe36 (diff) | |
download | emacs-b4bb3cbc7caca5c9c207d9ed42cacb978790af67.tar.gz |
Merged from miles@gnu.org--gnu-2005 (patch 69, 313-319)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-313
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-314
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-315
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-316
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-317
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-318
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-319
Update from CVS
* miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-69
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-347
Diffstat (limited to 'lisp/frame.el')
-rw-r--r-- | lisp/frame.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 25cc5aa38c8..ec98089cc0e 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -1278,7 +1278,7 @@ left untouched. FRAME nil or omitted means use the selected frame." This is done in the face `trailing-whitespace'." :tag "Highlight trailing whitespace." :type 'boolean - :group 'font-lock) + :group 'whitespace-faces) |