(with-selected-frame frame
(switch-to-buffer (or (car buffers)
(get-buffer-create "*scratch*")))
- (display-startup-echo-area-message))
+ (display-startup-echo-area-message)
(unless inhibit-splash-screen
- (display-splash-screen)))
+ (condition-case err
+ ;; This looks scary because `fancy-splash-screens'
+ ;; will call `recursive-edit' from a process filter.
+ ;; However, that should be safe to do now.
+ (display-splash-screen)
+ ;; `recursive-edit' will throw an error if Emacs is
+ ;; already doing a recursive edit elsewhere. Catch it
+ ;; here so that we can finish normally.
+ (error nil)))))
;; Delete the client if necessary.
(cond