master a35639015c: Revert "server-execute: Initialize the *scratch* buffer"

[Sean Whitton]

branch: master
commit a35639015c532c1fe418420cb8cb1da9053b4162
Author: Sean Whitton <spwhitton@spwhitton.name>
Commit: Sean Whitton <spwhitton@spwhitton.name>

    Revert "server-execute: Initialize the *scratch* buffer"
    
    This reverts commit f2d2fe6fc8ef0b6087c4a8a69d05a4e521b23047.
    
    To be replaced with factoring out *scratch* buffer initialization.
---
 lisp/server.el | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/lisp/server.el b/lisp/server.el
index fc6991df5f..763cf27f7a 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -82,9 +82,7 @@
 
 ;;; Code:
 
-(eval-when-compile
-  (require 'cl-lib)
-  (require 'subr-x))
+(eval-when-compile (require 'cl-lib))
 
 (defgroup server nil
   "Emacs running as a server process."
@@ -1368,14 +1366,9 @@ The following commands are accepted by the client:
                          (find-file-noselect initial-buffer-choice))
                         ((functionp initial-buffer-choice)
                          (funcall initial-buffer-choice)))))
-              (if (buffer-live-p buf)
-                  (switch-to-buffer buf 'norecord)
-                (if-let ((scratch (get-buffer "*scratch*")))
-                    (switch-to-buffer scratch 'norecord)
-                  (switch-to-buffer (get-buffer-create "*scratch*") 'norecord)
-                  (when initial-scratch-message
-                    (insert initial-scratch-message))
-                  (funcall initial-major-mode)))))
+             (switch-to-buffer
+              (if (buffer-live-p buf) buf (get-buffer-create "*scratch*"))
+              'norecord)))
 
           ;; Delete the client if necessary.
           (cond