# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1204238610 0
# Node ID 88b9f0aa6ce0ac319440c99934499ac3816b1c56
# Parent  962e043b10b50e04473fe8c9946b6a77ed7a8a59
*** empty log message ***

diff -r 962e043b10b5 -r 88b9f0aa6ce0 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Feb 28 22:41:09 2008 +0000
+++ b/lisp/ChangeLog	Thu Feb 28 22:43:30 2008 +0000
@@ -1,3 +1,13 @@
+2008-02-28  Juri Linkov  <juri@jurta.org>
+
+	* startup.el: Always add initial message to *scratch* buffer if
+	`initial-scratch-message' is non-nil regardless of the value of
+	`inhibit-startup-screen'.
+	(inhibit-startup-screen, initial-scratch-message): Doc fix.
+	(command-line-1): Move code that inserts `initial-scratch-message'
+	up before the if-form that checks for `inhibit-startup-screen'.
+	Suggested by Jonathan Rockway <jon@jrock.us>.
+
 2008-02-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* textmodes/fill.el (fill-comment-paragraph): Don't try to do