From 1ea67b1caebe8f85c8eadd742246ea68bc0ec876 Mon Sep 17 00:00:00 2001 From: Pierre Neidhardt Date: Sun, 16 Jun 2013 16:57:23 +0200 Subject: [PATCH] Emacs only uses desktop mode when launched in server mode. --- .emacs.d/main.el | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.emacs.d/main.el b/.emacs.d/main.el index 5cd3d424..7394ded7 100644 --- a/.emacs.d/main.el +++ b/.emacs.d/main.el @@ -404,10 +404,12 @@ has errors and/or warnings." ;; Let Emacs auto-load/save sessions. -(desktop-save-mode 1) -(setq history-length 250) -(setq desktop-dirname (concat emacs-cache-folder "desktop")) -(if (not (file-directory-p desktop-dirname)) - (make-directory desktop-dirname t)) -(setq desktop-path `(,desktop-dirname)) -(add-to-list 'desktop-globals-to-save 'compile-command) +(when (boundp 'server-running-p) + (desktop-save-mode 1) + (setq history-length 250) + (setq desktop-dirname (concat emacs-cache-folder "desktop")) + (if (not (file-directory-p desktop-dirname)) + (make-directory desktop-dirname t)) + (setq desktop-path `(,desktop-dirname)) + (add-to-list 'desktop-globals-to-save 'compile-command)) +