diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/info.el | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f348ce0733..6f92636e46 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2001-02-06 Eli Zaretskii <[email protected]> + * info.el (info-initialize): Remove the test for system-type when + invocation-directory is non-nil. + * progmodes/make-mode.el (makefile-mode): Set SYNTAX-BEGIN member of `font-lock-defaults' to `backward-paragraph' rather than nil. diff --git a/lisp/info.el b/lisp/info.el index 1add6ed522..b1a1faa4ce 100644 --- a/lisp/info.el +++ b/lisp/info.el @@ -312,8 +312,7 @@ Do the right thing if the file has been compressed or zipped." (source (expand-file-name "info/" source-directory)) (sibling (if installation-directory (expand-file-name "info/" installation-directory) - (if (and (memq system-type '(ms-dos windows-nt)) - invocation-directory) + (if invocation-directory (let ((infodir (expand-file-name "../info/" invocation-directory))) |