Merge branch 'master' of metalzone:etc/profile

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 1b7b5c1146b554fba64a0e4cf84c7c58c44cafa7..480abd116fba4cc21a0870c4742995b7ae67d719 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -87,9 +87,10 @@
 ;; Emacs server behaviour.
 
 (and (or window-system (>= emacs-major-version 23))
-     (trap (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$"))
-          (start-server)
-          (gnuserv-start)))
+     (progn (setq server-temp-file-regexp (concat "^" tmpdir "\\|/draft$")
+                 gnuserv-frame t)
+           (trap (server-start))
+           (trap (gnuserv-start))))
 
 ;; Control backup behaviour.