diff options
author | Miles Bader <miles@gnu.org> | 2005-05-12 03:41:19 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2005-05-12 03:41:19 +0000 |
commit | 6919bf38d2d61b1d502a6548384a992c9106a66d (patch) | |
tree | 49a0d6d5a589029bc63ffdc42947c37e76e400e5 /lisp/startup.el | |
parent | 608b34bf4ad0cd6e06215a4db25969d5391332cf (diff) | |
parent | 913d55fe7f6090b4ace4d910c397086607e4e878 (diff) | |
download | emacs-6919bf38d2d61b1d502a6548384a992c9106a66d.tar.gz |
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-51
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 289-301)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 68)
- Update from CVS
Diffstat (limited to 'lisp/startup.el')
-rw-r--r-- | lisp/startup.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 2d1b27f4bd1..a6679f923d0 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1108,7 +1108,7 @@ Values less than twice `fancy-splash-delay' are ignored." 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) |