Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 857-862)

   - Update from CVS
   - Merge from emacs--rel--22
   - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file.

 * emacs--rel--22  (patch 97-100)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 246-247)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-38

1 files changed, 1 insertions, 1 deletions

diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index df71ea9fb9a..841facff69c 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -847,7 +847,7 @@ Run the Viper tutorial? "))
               (delete-region (point-min) (point))
               (goto-char tutorial--point-before-chkeys)
               (setq tutorial--point-before-chkeys (point-marker)))
-          (insert-file-contents (expand-file-name filename data-directory))
+          (insert-file-contents (expand-file-name filename tutorial-directory))
           (forward-line)
           (setq tutorial--point-before-chkeys (point-marker)))