* lisp/tutorial.el (help-with-tutorial): Avoid an error on short screens.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4763c83c5a36fbbfec4a094616bc75c018649f4d..c655c4968df652ec17507e49800516ddd3069d4d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-08-20  Glenn Morris  <rgm@gnu.org>
 
+       * tutorial.el (help-with-tutorial): Avoid an error on short screens.
+
        * tutorial.el (tutorial--default-keys): Update some default bindings.
 
        * files.el (hack-local-variables): Fully ignore case for "mode:".

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index d47079af5af6b9e375ee389abe8a108eb8da7450..c57ec33d2e2c3948ad9c92ee3c59bbbca976f14b 100644 (file)
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -889,6 +889,11 @@ Run the Viper tutorial? "))
                  (search-forward ">>")
                  (replace-match "]")))
           (beginning-of-line)
+          ;; FIXME: if the window is not tall, and especially if the
+          ;; big red "NOTICE: The main purpose..." text has been
+          ;; inserted at the start of the buffer, the "type C-v to
+          ;; move to the next screen" might not be visible on the
+          ;; first screen (n < 0).  How will the novice know what to do?
           (let ((n (- (window-height (selected-window))
                       (count-lines (point-min) (point))
                       6)))
@@ -897,7 +902,7 @@ Run the Viper tutorial? "))
                   ;; For a short gap, we don't need the [...] line,
                   ;; so delete it.
                   (delete-region (point) (progn (end-of-line) (point)))
-                  (newline n))
+                  (if (> n 0) (newline n)))
               ;; Some people get confused by the large gap.
               (newline (/ n 2))