;; 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))
+ (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+ gnuserv-frame t)
+ (trap (server-start))
+ (trap (gnuserv-start))))
;; Control backup behaviour.