Mercurial > emacs
diff lisp/startup.el @ 83304:6fef25c75847
Merged from miles@gnu.org--gnu-2005 (patch 296-306)
Patches applied:
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-296
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-297
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-298
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-299
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-300
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-301
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-302
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-303
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-304
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-305
Update from CVS
* miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-306
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-344
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Fri, 13 May 2005 22:59:23 +0000 |
| parents | ad07ff6e4555 525da4fa7a18 |
| children | 21eea50897a7 |
line wrap: on
line diff
--- a/lisp/startup.el Mon May 09 16:17:25 2005 +0000 +++ b/lisp/startup.el Fri May 13 22:59:23 2005 +0000 @@ -1112,7 +1112,7 @@ Arguments from ARGS should be either strings, functions called with no args that return a string, or pairs `:face FACE', where FACE is a valid face specification, as it can be used with -`put-text-properties'." +`put-text-property'." (let ((current-face nil)) (while args (if (eq (car args) :face)