mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-07 08:00:48 -08:00
Code Issues Projects Releases Wiki Activity

server-execute: Initialize the *scratch* buffer

Browse source 
* lisp/server.el: Require subr-x when compiling.
(server-execute): Initialize the *scratch* buffer in the same way that
the scratch-buffer command does, for consistency.
This commit is contained in:
Sean Whitton 2022-05-03 18:08:14 -07:00
parent 185c2f1904
commit f2d2fe6fc8
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lisp/server.el
View file

@ -82,7 +82,9 @@
;;; Code:
(eval-when-compile (require 'cl-lib))
(eval-when-compile
(require 'cl-lib)
(require 'subr-x))
(defgroup server nil
"Emacs running as a server process."
@ -1366,9 +1368,14 @@ The following commands are accepted by the client:
(find-file-noselect initial-buffer-choice))
((functionp initial-buffer-choice)
(funcall initial-buffer-choice)))))
(switch-to-buffer
(if (buffer-live-p buf) buf (get-buffer-create "*scratch*"))
'norecord)))
(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)))))
;; Delete the client if necessary.
(cond