comparison lisp/startup.el @ 460:223736d75acb r21-2-45

Import from CVS: tag r21-2-45
author cvs
date Mon, 13 Aug 2007 11:43:24 +0200
parents c33ae14dd6d0
children 8a548306e08d
comparison
equal deleted inserted replaced
459:9d4fd877b885 460:223736d75acb
1274 1274
1275 (if debug-paths 1275 (if debug-paths
1276 (princ (format "lisp-directory:\n%S\n" lisp-directory) 1276 (princ (format "lisp-directory:\n%S\n" lisp-directory)
1277 'external-debugging-output)) 1277 'external-debugging-output))
1278 1278
1279 (if (featurep 'mule)
1280 (progn
1281 (setq mule-lisp-directory
1282 (paths-find-mule-lisp-directory roots
1283 lisp-directory))
1284 (if debug-paths
1285 (princ (format "mule-lisp-directory:\n%S\n"
1286 mule-lisp-directory)
1287 'external-debugging-output)))
1288 (setq mule-lisp-directory '()))
1289
1279 (setq site-directory (and (null inhibit-site-lisp) 1290 (setq site-directory (and (null inhibit-site-lisp)
1280 (paths-find-site-lisp-directory roots))) 1291 (paths-find-site-lisp-directory roots)))
1281 1292
1282 (if (and debug-paths (null inhibit-site-lisp)) 1293 (if (and debug-paths (null inhibit-site-lisp))
1283 (princ (format "site-directory:\n%S\n" site-directory) 1294 (princ (format "site-directory:\n%S\n" site-directory)
1286 (setq load-path (paths-construct-load-path roots 1297 (setq load-path (paths-construct-load-path roots
1287 early-package-load-path 1298 early-package-load-path
1288 late-package-load-path 1299 late-package-load-path
1289 last-package-load-path 1300 last-package-load-path
1290 lisp-directory 1301 lisp-directory
1291 site-directory)) 1302 site-directory
1303 mule-lisp-directory))
1292 1304
1293 (setq Info-directory-list 1305 (setq Info-directory-list
1294 (paths-construct-info-path roots 1306 (paths-construct-info-path roots
1295 early-packages late-packages last-packages)) 1307 early-packages late-packages last-packages))
1296 1308
1353 (save-excursion 1365 (save-excursion
1354 (set-buffer (get-buffer-create " *warning-tmp*")) 1366 (set-buffer (get-buffer-create " *warning-tmp*"))
1355 (erase-buffer) 1367 (erase-buffer)
1356 (buffer-disable-undo (current-buffer)) 1368 (buffer-disable-undo (current-buffer))
1357 (if (null lisp-directory) (push "lisp-directory" warnings)) 1369 (if (null lisp-directory) (push "lisp-directory" warnings))
1370 (if (and (featurep 'mule)
1371 (null mule-lisp-directory))
1372 (push "mule-lisp-directory" warnings))
1358 (if (null exec-directory) (push "exec-directory" warnings)) 1373 (if (null exec-directory) (push "exec-directory" warnings))
1359 (if (null data-directory) (push "data-directory" warnings)) 1374 (if (null data-directory) (push "data-directory" warnings))
1360 (if (null doc-directory) (push "doc-directory" warnings)) 1375 (if (null doc-directory) (push "doc-directory" warnings))
1361 (if (null load-path) (push "load-path" warnings)) 1376 (if (null load-path) (push "load-path" warnings))
1362 1377