# HG changeset patch # User Oleksandr Gavenko # Date 1422450454 -7200 # Node ID 2d151ab6761d018adc51cb6a7915a13549391f5c # Parent fd26eef91bf62e70fa412652bf3fa0bcf5c7f31a Fix condition for applying server-ensure-safe-dir fix. diff -r fd26eef91bf6 -r 2d151ab6761d .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")