comparison lisp/startup.el @ 866:613552a02607

[xemacs-hg @ 2002-06-04 17:39:43 by andyp] fix 21.4 merge problems
author andyp
date Tue, 04 Jun 2002 17:40:00 +0000
parents 42375619fa45
children d41e92ee6d12
comparison
equal deleted inserted replaced
865:987c2a685f39 866:613552a02607
535 nil) 535 nil)
536 (startup-setup-paths-warning)) 536 (startup-setup-paths-warning))
537 537
538 (startup-load-autoloads) 538 (startup-load-autoloads)
539 539
540 (unwind-protect 540 (let (error-data)
541 (command-line) 541 (condition-case data
542 (command-line)
543 ;; catch non-error signals, especially quit
544 (t (setq error-data data)))
542 ;; Do this again, in case the init file defined more abbreviations. 545 ;; Do this again, in case the init file defined more abbreviations.
543 (setq default-directory (abbreviate-file-name default-directory)) 546 (setq default-directory (abbreviate-file-name default-directory))
544 ;; Specify the file for recording all the auto save files of 547 ;; Specify the file for recording all the auto save files of
545 ;; this session. This is used by recover-session. 548 ;; this session. This is used by recover-session.
546 (if auto-save-list-file-prefix 549 (if auto-save-list-file-prefix