# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1166109457 0
# Node ID ac990ee1126d4333b874d3ee8a3f91eaeb5c92b6
# Parent  fca3bf689dc45aafd8ce526a3f4c566863f79a66
*** empty log message ***

diff -r fca3bf689dc4 -r ac990ee1126d lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Dec 14 15:16:52 2006 +0000
+++ b/lisp/ChangeLog	Thu Dec 14 15:17:37 2006 +0000
@@ -1,3 +1,8 @@
+2006-12-14  Richard Stallman  <rms@gnu.org>
+
+	* startup.el (use-fancy-splash-screens-p): Use frame-height
+	instead of window-height.  Pass frame to image-size.
+
 2006-12-13  Kenichi Handa  <handa@m17n.org>
 
 	* international/mule-cmds.el (set-locale-environment): Set
diff -r fca3bf689dc4 -r ac990ee1126d lisp/align.el
--- a/lisp/align.el	Thu Dec 14 15:16:52 2006 +0000
+++ b/lisp/align.el	Thu Dec 14 15:17:37 2006 +0000
@@ -4,6 +4,7 @@
 ;;   2005, 2006 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
+;; Maintainer: FSF
 ;; Keywords: convenience languages lisp
 
 ;; This file is part of GNU Emacs.