summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>2006-12-14 15:17:37 +0000
committerRichard M. Stallman <rms@gnu.org>2006-12-14 15:17:37 +0000
commit012884e2473bd2d9686f2cc159981729797236ef (patch)
tree51685899f32a89be925efba688782babf9aa9a75 /lisp
parenta68ccb40d6d0d89ef65d9e5e80b0c393fe29d6c2 (diff)
downloademacs-012884e2473bd2d9686f2cc159981729797236ef.tar.gz
*** empty log message ***
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/align.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7d7529c315..c758e34089b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/align.el b/lisp/align.el
index b49979059a3..a3cc531d796 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -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.