Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
83303:108e45fdcdbd | 83304:6fef25c75847 |
---|---|
1110 (defun fancy-splash-insert (&rest args) | 1110 (defun fancy-splash-insert (&rest args) |
1111 "Insert text into the current buffer, with faces. | 1111 "Insert text into the current buffer, with faces. |
1112 Arguments from ARGS should be either strings, functions called | 1112 Arguments from ARGS should be either strings, functions called |
1113 with no args that return a string, or pairs `:face FACE', | 1113 with no args that return a string, or pairs `:face FACE', |
1114 where FACE is a valid face specification, as it can be used with | 1114 where FACE is a valid face specification, as it can be used with |
1115 `put-text-properties'." | 1115 `put-text-property'." |
1116 (let ((current-face nil)) | 1116 (let ((current-face nil)) |
1117 (while args | 1117 (while args |
1118 (if (eq (car args) :face) | 1118 (if (eq (car args) :face) |
1119 (setq args (cdr args) current-face (car args)) | 1119 (setq args (cdr args) current-face (car args)) |
1120 (insert (propertize (let ((it (car args))) | 1120 (insert (propertize (let ((it (car args))) |