2 files changed, 12 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ebce356719f..dfea40b56ba 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2007-07-08  Martin Rudalics  <rudalics@gmx.at>
+
+        * novice.el (disabled-command-function): Fit window to buffer to
+        make last line visible.
+        Reported by Stephen Berman <Stephen.Berman at gmx.net>.
+
+        * mouse.el (mouse-drag-track): Reset transient-mark-mode to nil
+        when handling the terminating event.
+
 2007-07-07  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc/calc.el (math-read-number-simple): Remove leading 0s.
diff --git a/lisp/novice.el b/lisp/novice.el
index f5c3019dfc2..346877dcdda 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -88,8 +88,9 @@ n   to cancel--don't try the command, and it remains disabled.
 SPC to try the command just this once, but leave it disabled.
 !   to try it, and enable all disabled commands for this session only.")
        (save-excursion
-        (set-buffer standard-output)
-        (help-mode)))
+         (set-buffer standard-output)
+         (help-mode)))
+     (fit-window-to-buffer (get-buffer-window "*Disabled Command*"))
      (message "Type y, n, ! or SPC (the space bar): ")
      (let ((cursor-in-echo-area t))
        (while (progn (setq char (read-event))