# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1423205079 -7200
# Node ID 4f9828e2c1864392dcc98aa3bddcce0187d3eb97
# Parent  17ed3f571ca45f200bc75ea255ede8e863dd06b3# Parent  2d151ab6761d018adc51cb6a7915a13549391f5c
merged

diff -r 17ed3f571ca4 -r 4f9828e2c186 .emacs-my
--- a/.emacs-my	Wed Feb 04 23:43:38 2015 +0200
+++ b/.emacs-my	Fri Feb 06 08:44:39 2015 +0200
@@ -489,11 +489,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")