(tutorial-directory): New constant.

(fancy-splash-text): Tutorials now in tutorial-directory.

diff --git a/lisp/startup.el b/lisp/startup.el
index 53f120b0159561941d02561bc741a0c5c99bfc2d..d791a0f6e5a3bf792693291d865006395adc988f 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -308,6 +308,9 @@ from being initialized."
 (defvar pure-space-overflow nil
   "Non-nil if building Emacs overflowed pure space.")
 
+(defconst tutorial-directory (expand-file-name "tutorials" data-directory)
+  "Directory containing the Emacs TUTORIAL files.")
+
 (defun normal-top-level-add-subdirs-to-load-path ()
   "Add all subdirectories of current directory to `load-path'.
 More precisely, this uses only the subdirectories whose names
@@ -1150,7 +1153,7 @@ regardless of the value of this variable."
                              en))
                     (title (with-temp-buffer
                              (insert-file-contents
-                              (expand-file-name tut data-directory)
+                              (expand-file-name tut tutorial-directory)
                               nil 0 256)
                              (search-forward ".")
                              (buffer-substring (point-min) (1- (point))))))
@@ -1277,11 +1280,11 @@ where FACE is a valid face specification, as it can be used with
                            fancy-splash-image)
                           ((and (display-color-p)
                                 (image-type-available-p 'xpm))
-                           (if (and (fboundp 'x-display-planes)
-                                    (= (funcall 'x-display-planes) 8))
-                               "splash8.xpm"
-                             "splash.xpm"))
-                          (t "splash.pbm")))
+                            (if (and (fboundp 'x-display-planes)
+                                     (= (funcall 'x-display-planes) 8))
+                                "splash8.xpm"
+                              "splash.xpm"))
+                            (t "splash.pbm")))
         (img (create-image image-file))
         (image-width (and img (car (image-size img))))
         (window-width (window-width (selected-window))))