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 3c981430d2bdd49cb9aef5a28be4087f96f67640..823afd3ac8f06592b6f34d9379c06b34f194655a 100644 (file)
--- a/emacs_el/configuration/don-configuration.org
+++ b/emacs_el/configuration/don-configuration.org
@@ -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
@@ -2211,8 +2214,8 @@ From http://julien.danjou.info/projects/emacs-packages#rainbow-mode, this colori
 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 desktop-save
-    :defer f
+  (use-package emacs
+    :demand
     :config
     (setq desktop-base-file-name
           (convert-standard-filename
@@ -2225,9 +2228,11 @@ emacs, and use a different desktop file to restore history
           (convert-standard-filename
            (concat desktop-base-file-name
                    ".lock")))
-    (desktop-save-mode 1)
     (setq desktop-auto-save-timeout 60)
-    (desktop-read)
+    (setq desktop-restore-eager 5)
+    (setq desktop-lazy-verbose nil)
+    (desktop-save-mode 1)
+    ; (desktop-read)
   )
 #+END_SRC
 ** Misc (Uncharacterized)
@@ -2386,7 +2391,7 @@ emacs, and use a different desktop file to restore history
     :config
     (setq server-name
           (or (getenv "EMACS_SERVER_NAME")
-              "emacs"))
+              "server"))
     (unless (server-running-p)
       (global-set-key "\C-xp" 'server-edit)
       (server-start)))