diff options
| author | Miles Bader <miles@gnu.org> | 2007-08-27 09:21:49 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-08-27 09:21:49 +0000 |
| commit | 62fb5e25f4a4c7da6fe6a06569b22a27998ae6bf (patch) | |
| tree | 9e21647ad3ab0f43ea02d372adc4cfa9947e5309 /lisp/startup.el | |
| parent | 9005667b3381a785759a996e00fb1acfd126eecc (diff) | |
| parent | 83cc8d356afe3bfd68da74b822549e02047ed041 (diff) | |
| download | emacs-62fb5e25f4a4c7da6fe6a06569b22a27998ae6bf.tar.gz | |
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
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index d351e84c87c..1f42285d553 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -315,6 +315,14 @@ from being initialized." (defvar pure-space-overflow nil "Non-nil if building Emacs overflowed pure space.") +(defvar tutorial-directory nil + "Directory containing the Emacs TUTORIAL files.") + +;; Get correct value in a dumped, installed Emacs. +(eval-at-startup + (setq tutorial-directory (file-name-as-directory + (expand-file-name "tutorials" data-directory)))) + (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 @@ -1134,7 +1142,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)))))) @@ -1261,11 +1269,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)))) |