Mercurial > emacs
changeset 82728:3a5502138995
(tutorial-directory): New constant.
(fancy-splash-text): Tutorials now in tutorial-directory.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 22 Aug 2007 07:41:58 +0000 |
| parents | 2b7d8159f9a4 |
| children | 10439b0bb602 |
| files | lisp/startup.el |
| diffstat | 1 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Wed Aug 22 07:41:44 2007 +0000 +++ b/lisp/startup.el Wed Aug 22 07:41:58 2007 +0000 @@ -308,6 +308,9 @@ (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 @@ 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 @@ 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))))