Mercurial > emacs
comparison lisp/info.el @ 25811:c3cb1d841464
(info-initialize): Don't test existence of ALTERNATIVE
if we know for some other reason it should not be used.
author | Phillip Rulon <pjr@gnu.org> |
---|---|
date | Fri, 24 Sep 1999 13:58:46 +0000 |
parents | b6b86ee38391 |
children | 620e4683a89e |
comparison
equal
deleted
inserted
replaced
25810:f1417ed050c0 | 25811:c3cb1d841464 |
---|---|
254 ;; Uninstalled, Emacs builddir != srcdir. | 254 ;; Uninstalled, Emacs builddir != srcdir. |
255 (setq alternative sibling) | 255 (setq alternative sibling) |
256 ;; Uninstalled, builddir == srcdir | 256 ;; Uninstalled, builddir == srcdir |
257 (setq alternative source)) | 257 (setq alternative source)) |
258 (if (or (member alternative Info-default-directory-list) | 258 (if (or (member alternative Info-default-directory-list) |
259 (not (file-exists-p alternative)) | |
260 ;; On DOS/NT, we use movable executables always, | 259 ;; On DOS/NT, we use movable executables always, |
261 ;; and we must always find the Info dir at run time. | 260 ;; and we must always find the Info dir at run time. |
262 (if (memq system-type '(ms-dos windows-nt)) | 261 (if (memq system-type '(ms-dos windows-nt)) |
263 nil | 262 nil |
264 ;; Use invocation-directory for Info | 263 ;; Use invocation-directory for Info |
265 ;; only if we used it for exec-directory also. | 264 ;; only if we used it for exec-directory also. |
266 (not (string= exec-directory | 265 (not (string= exec-directory |
267 (expand-file-name "lib-src/" | 266 (expand-file-name "lib-src/" |
268 installation-directory))))) | 267 installation-directory)))) |
268 (not (file-exists-p alternative))) | |
269 Info-default-directory-list | 269 Info-default-directory-list |
270 ;; `alternative' contains the Info files that came with this | 270 ;; `alternative' contains the Info files that came with this |
271 ;; version, so we should look there first. `Info-insert-dir' | 271 ;; version, so we should look there first. `Info-insert-dir' |
272 ;; currently expects to find `alternative' first on the list. | 272 ;; currently expects to find `alternative' first on the list. |
273 (cons alternative | 273 (cons alternative |