diff options
| author | Eli Zaretskii | 2001-02-06 17:15:39 +0000 |
|---|---|---|
| committer | Eli Zaretskii | 2001-02-06 17:15:39 +0000 |
| commit | fecd556a3bdce361a5bdf2374490ffad18bf829e (patch) | |
| tree | d86aceebc38e0adfc9722d05b15289d13179b5f8 | |
| parent | c7ca58df3bc4e9fa080af6f22da1e6b4bd311b61 (diff) | |
| download | emacs-fecd556a3bdce361a5bdf2374490ffad18bf829e.tar.gz emacs-fecd556a3bdce361a5bdf2374490ffad18bf829e.zip | |
(info-initialize): Remove the test for system-type when
invocation-directory is non-nil.
| -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 f348ce0733b..6f92636e461 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2001-02-06 Eli Zaretskii <eliz@is.elta.co.il> | 1 | 2001-02-06 Eli Zaretskii <eliz@is.elta.co.il> |
| 2 | 2 | ||
| 3 | * info.el (info-initialize): Remove the test for system-type when | ||
| 4 | invocation-directory is non-nil. | ||
| 5 | |||
| 3 | * progmodes/make-mode.el (makefile-mode): Set SYNTAX-BEGIN member | 6 | * progmodes/make-mode.el (makefile-mode): Set SYNTAX-BEGIN member |
| 4 | of `font-lock-defaults' to `backward-paragraph' rather than nil. | 7 | of `font-lock-defaults' to `backward-paragraph' rather than nil. |
| 5 | 8 | ||
diff --git a/lisp/info.el b/lisp/info.el index 1add6ed522f..b1a1faa4cea 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." | |||
| 312 | (source (expand-file-name "info/" source-directory)) | 312 | (source (expand-file-name "info/" source-directory)) |
| 313 | (sibling (if installation-directory | 313 | (sibling (if installation-directory |
| 314 | (expand-file-name "info/" installation-directory) | 314 | (expand-file-name "info/" installation-directory) |
| 315 | (if (and (memq system-type '(ms-dos windows-nt)) | 315 | (if invocation-directory |
| 316 | invocation-directory) | ||
| 317 | (let ((infodir (expand-file-name | 316 | (let ((infodir (expand-file-name |
| 318 | "../info/" | 317 | "../info/" |
| 319 | invocation-directory))) | 318 | invocation-directory))) |