comparison lisp/startup.el @ 408:501cfd01ee6d r21-2-34

Import from CVS: tag r21-2-34
author cvs
date Mon, 13 Aug 2007 11:18:11 +0200
parents 2f8bb876ab1d
children de805c49cfc1
comparison
equal deleted inserted replaced
407:ed6218a7d4d3 408:501cfd01ee6d
367 (princ (format "\ndoc-directory is %S" doc-directory) stream) 367 (princ (format "\ndoc-directory is %S" doc-directory) stream)
368 (princ (format "\nload-path is %S" load-path) stream) 368 (princ (format "\nload-path is %S" load-path) stream)
369 (princ "\n\n" stream))) 369 (princ "\n\n" stream)))
370 (when (not suppress-early-error-handler-backtrace) 370 (when (not suppress-early-error-handler-backtrace)
371 (backtrace stream t))) 371 (backtrace stream t)))
372 (if (fboundp 'mswindows-message-box)
373 (mswindows-message-box "Initialization error"))
372 (kill-emacs -1)) 374 (kill-emacs -1))
373
374 (defvar lock-directory)
375 (defvar superlock-file)
376 375
377 (defun normal-top-level () 376 (defun normal-top-level ()
378 (if command-line-processed 377 (if command-line-processed
379 (message "Back to top level.") 378 (message "Back to top level.")
380 (setq command-line-processed t) 379 (setq command-line-processed t)
1144 1143
1145 (if debug-paths 1144 (if debug-paths
1146 (princ (format "Info-directory-list:\n%S\n" Info-directory-list) 1145 (princ (format "Info-directory-list:\n%S\n" Info-directory-list)
1147 'external-debugging-output)) 1146 'external-debugging-output))
1148 1147
1149 (if (boundp 'lock-directory)
1150 (progn
1151 (setq lock-directory (paths-find-lock-directory roots))
1152 (setq superlock-file (paths-find-superlock-file lock-directory))
1153
1154 (if debug-paths
1155 (progn
1156 (princ (format "lock-directory:\n%S\n" lock-directory)
1157 'external-debugging-output)
1158 (princ (format "superlock-file:\n%S\n" superlock-file)
1159 'external-debugging-output)))))
1160
1161 (setq exec-directory (paths-find-exec-directory roots)) 1148 (setq exec-directory (paths-find-exec-directory roots))
1162 1149
1163 (if debug-paths 1150 (if debug-paths
1164 (princ (format "exec-directory:\n%s\n" exec-directory) 1151 (princ (format "exec-directory:\n%s\n" exec-directory)
1165 'external-debugging-output)) 1152 'external-debugging-output))
1203 1190
1204 (princ "\nWARNING:\n" 'external-debugging-output) 1191 (princ "\nWARNING:\n" 'external-debugging-output)
1205 (princ (buffer-string) 'external-debugging-output))) 1192 (princ (buffer-string) 'external-debugging-output)))
1206 1193
1207 (defun startup-setup-paths-warning () 1194 (defun startup-setup-paths-warning ()
1208 (let ((lock (if (boundp 'lock-directory) lock-directory 't)) 1195 (let ((warnings '()))
1209 (warnings '()))
1210 (if (and (stringp lock) (null (file-directory-p lock)))
1211 (setq lock nil))
1212 (cond 1196 (cond
1213 ((null (and lisp-directory exec-directory data-directory doc-directory 1197 ((null (and lisp-directory exec-directory data-directory doc-directory
1214 load-path 1198 load-path))
1215 lock))
1216 (save-excursion 1199 (save-excursion
1217 (set-buffer (get-buffer-create " *warning-tmp*")) 1200 (set-buffer (get-buffer-create " *warning-tmp*"))
1218 (erase-buffer) 1201 (erase-buffer)
1219 (buffer-disable-undo (current-buffer)) 1202 (buffer-disable-undo (current-buffer))
1220 (if (null lisp-directory) (push "lisp-directory" warnings)) 1203 (if (null lisp-directory) (push "lisp-directory" warnings))
1221 (if (null lock) (push "lock-directory" warnings))
1222 (if (null exec-directory) (push "exec-directory" warnings)) 1204 (if (null exec-directory) (push "exec-directory" warnings))
1223 (if (null data-directory) (push "data-directory" warnings)) 1205 (if (null data-directory) (push "data-directory" warnings))
1224 (if (null doc-directory) (push "doc-directory" warnings)) 1206 (if (null doc-directory) (push "doc-directory" warnings))
1225 (if (null load-path) (push "load-path" warnings)) 1207 (if (null load-path) (push "load-path" warnings))
1226 1208