From: Glenn Morris Date: Fri, 24 Aug 2007 02:57:53 +0000 (+0000) Subject: (tutorial-directory): Set with eval-at-startup so it gets the right X-Git-Tag: emacs-pretest-23.0.90~11346 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5f5ba82536858ccac91a7dff38d95e75b23c5e55;p=emacs.git (tutorial-directory): Set with eval-at-startup so it gets the right value in an installed Emacs. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b6440133395..bfeef25ffcb 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,8 +1,18 @@ +2007-08-24 Glenn Morris + + * startup.el (tutorial-directory): Set with eval-at-startup so it + gets the right value in an installed Emacs. + +2007-08-24 Nikolaj Schumacher (tiny change) + + * emacs-lisp/eldoc.el (eldoc-highlight-function-argument): New face. + (eldoc-highlight-function-argument): Use it. + 2007-08-23 Masatake YAMATO * progmodes/cc-fonts.el (gtkdoc-font-lock-doc-comments): Highlight name of parameters in document body. - + 2007-08-23 Stefan Monnier * emacs-lisp/bytecomp.el (byte-compile-output-docform) diff --git a/lisp/startup.el b/lisp/startup.el index d791a0f6e5a..30d058afabc 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -308,9 +308,14 @@ 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) +(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