the default server name is server, not emacs

[lib.git] / emacs_el / configuration / don-configuration.org

diff --git a/emacs_el/configuration/don-configuration.org b/emacs_el/configuration/don-configuration.org
index e9b962c70cd52f580753485b5174653864aae21f..823afd3ac8f06592b6f34d9379c06b34f194655a 100644 (file)
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -914,13 +914,13 @@ This can be used to link things pretty quickly if necessary
   (use-package ess
     :ensure t
     :commands R
-    :mode "\\.R\\'"
+    :mode ("\\.R\\'" . ess-r-mode)
     :bind (:map ess-mode-map
                 ("C-c C-R" . dla/ess-region-remote-eval))
     :config
     (defun ess-change-directory (path)
       "Set the current working directory to PATH for both *R* and Emacs."
-      (interactive "DDirectory to change to: ")
+      (interactive "Directory to change to: ")
     
       (when (file-exists-p path)
         (ess-command (concat "setwd(\"" path "\")\n"))
@@ -1033,7 +1033,7 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 ** Spamassassin Mode
 #+BEGIN_SRC emacs-lisp
   (use-package spamassassin-mode
-    :defer
+    :commands spamassassin-mode
     :ensure f
     )
 #+END_SRC
@@ -1059,7 +1059,7 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 ** Abbrev Mode
 #+BEGIN_SRC emacs-lisp
   (use-package abbrev
-    :diminish abbrev
+    :diminish abbrev-mode
     :config
     ;; load abbreviations from 
     (setq abbrev-file-name       
@@ -1132,10 +1132,13 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 * Base emacs
 ** Reverting buffers
 #+BEGIN_SRC emacs-lisp
-  (setq global-auto-revert-non-file-buffers t
-        global-auto-revert-ignore-modes '(pdf-view-mode)
-        auto-revert-verbose nil)
-  (global-auto-revert-mode 1)
+  (use-package autorevert
+    :diminish auto-revert-mode
+    :config
+    (setq global-auto-revert-non-file-buffers t
+          global-auto-revert-ignore-modes '(pdf-view-mode)
+          auto-revert-verbose nil)
+    (global-auto-revert-mode 1))
 #+END_SRC
 * Org Mode
 ** Use-package and load things
@@ -2206,8 +2209,34 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 
   (column-number-mode t)
  
-  (desktop-save-mode)
-  (desktop-read)
+#+END_SRC
+** Desktop-save-mode
+If the envvar EMACS_SERVER_NAME is set, consider this a separate
+emacs, and use a different desktop file to restore history
+#+BEGIN_SRC emacs-lisp
+  (use-package emacs
+    :demand
+    :config
+    (setq desktop-base-file-name
+          (convert-standard-filename
+           (concat ".emacs"
+                   (or (getenv "EMACS_SERVER_NAME")
+                       "")
+                   ".desktop")
+           ))
+    (setq desktop-base-lock-name
+          (convert-standard-filename
+           (concat desktop-base-file-name
+                   ".lock")))
+    (setq desktop-auto-save-timeout 60)
+    (setq desktop-restore-eager 5)
+    (setq desktop-lazy-verbose nil)
+    (desktop-save-mode 1)
+    ; (desktop-read)
+  )
+#+END_SRC
+** Misc (Uncharacterized)
+#+BEGIN_SRC emacs-lisp
   '(icomplete-mode on)
   (custom-set-faces
    ;; custom-set-faces was added by Custom.
@@ -2356,10 +2385,16 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
   (ad-activate 'ask-user-about-supersession-threat)
 #+END_SRC
 
-* Server
+* Start Server
 #+BEGIN_SRC emacs-lisp
-  (unless (server-running-p)
-  (server-start))
+  (use-package server
+    :config
+    (setq server-name
+          (or (getenv "EMACS_SERVER_NAME")
+              "server"))
+    (unless (server-running-p)
+      (global-set-key "\C-xp" 'server-edit)
+      (server-start)))
 #+END_SRC