Mercurial > hg > xemacs-beta
diff 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 |
line wrap: on
line diff
--- a/lisp/startup.el Tue Jun 04 16:45:54 2002 +0000 +++ b/lisp/startup.el Tue Jun 04 17:40:00 2002 +0000 @@ -537,8 +537,11 @@ (startup-load-autoloads) - (unwind-protect - (command-line) + (let (error-data) + (condition-case data + (command-line) + ;; catch non-error signals, especially quit + (t (setq error-data data))) ;; Do this again, in case the init file defined more abbreviations. (setq default-directory (abbreviate-file-name default-directory)) ;; Specify the file for recording all the auto save files of