X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/b615028ccd0488c88480d931894f8e8655043344..7cd3318bec2f596106ad48f9b5b191b37148aea1:/dot/emacs

diff --git a/dot/emacs b/dot/emacs
index 51b0470..845f1ff 100644
--- a/dot/emacs
+++ b/dot/emacs
@@ -86,9 +86,10 @@
 
 ;; Emacs server behaviour.
 
-(and window-system
-     (trap (gnuserv-start)
-	   (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))))
+(and (or window-system (>= emacs-major-version 23))
+     (trap (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))
+	   (start-server)
+	   (gnuserv-start)))
 
 ;; Control backup behaviour.
 
@@ -359,14 +360,13 @@
       (mdw-uniquify-alist
        '((width . 78)
 	 (height . 33)
-	 (vertical-scroll-bars . right))
-       (and window-system
-	    '((cursor-type . bar)
-	      (cursor-blink . t)
-	      (left-fringe . 5)
-	      (right-fringe . 5)
-	      (scroll-bar-width . 15)))
-       '((cursor-color . "red"))
+	 (vertical-scroll-bars . right)
+	 (cursor-type . bar)
+	 (cursor-blink . t)
+	 (left-fringe . 5)
+	 (right-fringe . 5)
+	 (scroll-bar-width . 15)
+	 (cursor-color . "red"))
        (if mdw-black-background
 	   '((background-color . "black")
 	     (foreground-color . "white")
@@ -555,9 +555,6 @@
 (setq lazy-lock-stealth-lines 100)
 (setq lazy-lock-stealth-verbose t)
 
-(add-hook 'after-make-frame-functions 'mdw-do-set-font)
-(add-hook 'term-setup-hook (lambda () (mdw-do-set-font (selected-frame))))
-(add-hook 'window-setup-hook (lambda () (mdw-do-set-font (selected-frame))))
 
 (add-hook 'c-mode-hook 'mdw-fontify-c-and-c++ t)
 (add-hook 'objc-mode-hook 'mdw-fontify-c-and-c++ t)