Fix condition for applying server-ensure-safe-dir fix.
authorOleksandr Gavenko <gavenkoa@gmail.com>
Wed, 28 Jan 2015 15:07:34 +0200
changeset 1203 2d151ab6761d
parent 1196 fd26eef91bf6
child 1204 4f9828e2c186
Fix condition for applying server-ensure-safe-dir fix.
.emacs-my
--- a/.emacs-my	Sat Jan 17 14:35:26 2015 +0200
+++ b/.emacs-my	Wed Jan 28 15:07:34 2015 +0200
@@ -487,11 +487,10 @@
 
 (when (and (>= emacs-major-version 22) (not (eq system-type 'cygwin)))
   (require 'server)
-  (when (and (= emacs-major-version 23) (>= emacs-minor-version 1) (<= emacs-minor-version 2) (equal window-system 'w32))
+  (when (and (>= emacs-major-version 23) (equal window-system 'w32))
     (defun server-ensure-safe-dir (dir) "Noop" t)) ; Suppress error directory ~/.emacs.d/server is unsafe on windows.
   (when (or (= emacs-major-version 22) (not (eq (server-running-p server-name) t)))
-    (server-start))
-  )
+    (server-start)) )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "standart/general settings")