# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1205358902 0
# Node ID 503ca3b320754d9267e00c85c33cee8a49379259
# Parent  da7c30c567ef80d7add37ab15814c6c8e8f5ea02
*** empty log message ***

diff -r da7c30c567ef -r 503ca3b32075 lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Mar 12 21:54:47 2008 +0000
+++ b/lisp/ChangeLog	Wed Mar 12 21:55:02 2008 +0000
@@ -1,3 +1,15 @@
+2008-03-12  Juri Linkov  <juri@jurta.org>
+
+	* help.el (describe-project): Remove defaliases for view-todo and
+	describe-project that are now unnecessary after the merge from
+	emacs--rel--22 that added define-obsolete-function-alias.
+
+	* startup.el (inhibit-startup-screen): Revert incomplete
+	2008-03-10 merge from emacs--rel--22 that partly reverted
+	2008-02-28 change that added initial message to *scratch* buffer
+	regardless of the value of `inhibit-startup-screen'.
+	Now keep this change in the trunk, but not in the 22 branch.
+
 2008-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* international/quail.el (quail-setup-completion-buf, quail-help):