diff options
| author | Richard M. Stallman | 1994-09-15 03:07:47 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 1994-09-15 03:07:47 +0000 |
| commit | 2677ad61f5da8a85dfd2b8f004275de88823e1fe (patch) | |
| tree | 8c4395dda2ead8cf93e3ae19bf26b9f98ec6ff20 | |
| parent | 1ed14cfd6db155ac2a49e129a9245928c1654d48 (diff) | |
| download | emacs-2677ad61f5da8a85dfd2b8f004275de88823e1fe.tar.gz emacs-2677ad61f5da8a85dfd2b8f004275de88823e1fe.zip | |
(commmand-line): Fix previous change.
| -rw-r--r-- | lisp/startup.el | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 5b5594e4a61..6b646eed849 100644 --- a/lisp/startup.el +++ b/lisp/startup.el | |||
| @@ -256,17 +256,20 @@ specified by the LC_ALL, LC_CTYPE and LANG environment variables.") | |||
| 256 | nil t)) | 256 | nil t)) |
| 257 | ;; If we can't read it, print the error message and exit. | 257 | ;; If we can't read it, print the error message and exit. |
| 258 | (error | 258 | (error |
| 259 | (if (eq (car error) 'error) | 259 | (princ |
| 260 | (message "%s" (apply 'concat (cdr error))) | 260 | (if (eq (car error) 'error) |
| 261 | (if (memq 'file-error (get (car error) 'error-conditions)) | 261 | (apply 'concat (cdr error)) |
| 262 | (message "%s: %s" | 262 | (if (memq 'file-error (get (car error) 'error-conditions)) |
| 263 | (nth 1 error) | 263 | (format "%s: %s" |
| 264 | (mapconcat '(lambda (obj) (prin1-to-string obj t)) | 264 | (nth 1 error) |
| 265 | (cdr (cdr error)) ", ")) | 265 | (mapconcat '(lambda (obj) (prin1-to-string obj t)) |
| 266 | (message "%s: %s" | 266 | (cdr (cdr error)) ", ")) |
| 267 | (get (car error) 'error-message) | 267 | (format "%s: %s" |
| 268 | (mapconcat '(lambda (obj) (prin1-to-string obj t)) | 268 | (get (car error) 'error-message) |
| 269 | (cdr error) ", ")))) | 269 | (mapconcat '(lambda (obj) (prin1-to-string obj t)) |
| 270 | (cdr error) ", ")))) | ||
| 271 | 'external-debugging-output) | ||
| 272 | (setq window-system nil) | ||
| 270 | (kill-emacs))) | 273 | (kill-emacs))) |
| 271 | 274 | ||
| 272 | (let ((done nil) | 275 | (let ((done nil) |