1 files changed, 3 insertions, 4 deletions
diff --git a/init.el b/init.el
index 958a61a..c753acd 100644
--- a/init.el
+++ b/init.el
@@ -126,15 +126,14 @@
 
 ;;;; yes/no, bell, startup message
 
-(if (version< emacs-version "28")
-    (fset 'yes-or-no-p 'y-or-n-p)
-  (setq use-short-answers t))
+(setq use-short-answers t)
 (setq inhibit-startup-message t)
 (setq visible-bell t)
 
 ;;;; server
 (setenv "EDITOR" "emacsclient")
-(unless (daemonp) (server-start))
+(require 'server)
+(unless (or (daemonp) (server-running-p)) (server-start))
 
 ;;;; timers
 (put 'list-timers 'disabled nil)