aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/startup.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6e688453c28..621d1ae9c1d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-05-09 Reiner Steib <Reiner.Steib@gmx.de>
2
3 * startup.el (fancy-splash-insert): Fix typo in doc string.
4
12005-05-09 Juanma Barranquero <lekktu@gmail.com> 52005-05-09 Juanma Barranquero <lekktu@gmail.com>
2 6
3 * obsolete/float.el (string-to-float): 7 * obsolete/float.el (string-to-float):
diff --git a/lisp/startup.el b/lisp/startup.el
index e3d0232b9ce..c9f8d5e26e7 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1108,7 +1108,7 @@ Values less than twice `fancy-splash-delay' are ignored."
1108Arguments from ARGS should be either strings, functions called 1108Arguments from ARGS should be either strings, functions called
1109with no args that return a string, or pairs `:face FACE', 1109with no args that return a string, or pairs `:face FACE',
1110where FACE is a valid face specification, as it can be used with 1110where FACE is a valid face specification, as it can be used with
1111`put-text-properties'." 1111`put-text-property'."
1112 (let ((current-face nil)) 1112 (let ((current-face nil))
1113 (while args 1113 (while args
1114 (if (eq (car args) :face) 1114 (if (eq (car args) :face)