*** empty log message ***

3 files changed, 32 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index f798b93479a..6e8a5766e33 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -88,6 +88,12 @@ types any more.  Add -DUSE_LISP_UNION_TYPE if you want union types.
 
 * Changes in Emacs 21.4
 
+** New command line option -Q.
+
+This is like using -q --no-site-file, but in addition it also disables
+the menu-bar, the tool-bar, the scroll-bars, tool tips, the blinking
+cursor, and the fancy startup screen.
+
 ** C-h v and C-h f commands now include a hyperlink to the C source for
 variables and functions defined in C (if the C source is available).
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ee1b6ce7176..0fbdc018379 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2004-04-14  Kim F. Storm  <storm@cua.dk>
 
+        * startup.el (emacs-quick-startup): New defvar (set by -Q).
+        (command-line): New option -Q.  Like -q --no-site-file, but
+        in addition it also disables menu-bar, tool-bar, scroll-bars,
+        tool-tips, and the blinking cursor.
+        (command-line-1): Skip startup screen if -Q.
+        (fancy-splash-head): Use :align-to center prop to center splash image.
+
         * emulation/cua-base.el (cua-read-only-cursor-color)
         (cua-overwrite-cursor-color, cua-global-mark-cursor-color): Doc fix.
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 16ad872e9c7..8a93a5d900e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,22 @@
+2004-04-14  Kim F. Storm  <storm@cua.dk>
+
+        * editfns.c (Fformat): Fix allocation size of precision array.
+
+        * dispnew.c (update_window): Only set changed_p if
+        scrolling_window actually did scroll.
+        (scrolling_window): Only return 1 if we actually did scroll.
+
+        * xdisp.c (get_glyph_string_clip_rect): Fix reduction of cursor
+        height to glyph height when cursor row is not fully visible.
+        (make_cursor_line_fully_visible): Add FORCE_P arg to return
+        failure in case row is higher than window.  Callers changed.
+        (try_scrolling): Fix loop in scrolling if last_line_misfit (from Gerd).
+        Try to scroll partially visible, higher-than-window cursor row.
+        (redisplay_window): Always try to scroll partially visible,
+        higher-than-window cursor row - both initially and again with
+        centering_position = 0.
+        Clear desired matrix before retrying with centering_position = 0.
+
 2004-04-13  Joe Buehler  <jbuehler@hekimian.com>
 
         * sheap.c, unexcw.c: New files.