[Emacs-diffs] Changes to emacs/lisp/ChangeLog,v

[Juri Linkov]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Juri Linkov <jurta>     08/03/12 21:55:04

Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.13046
retrieving revision 1.13047
diff -u -b -r1.13046 -r1.13047
--- ChangeLog   12 Mar 2008 21:01:35 -0000      1.13046
+++ ChangeLog   12 Mar 2008 21:55:02 -0000      1.13047
@@ -1,3 +1,15 @@
+2008-03-12  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * international/quail.el (quail-setup-completion-buf, quail-help):