diff -r 95d6a3c48afd -r 81ca1335730a .emacs-my --- a/.emacs-my Sat Jun 25 22:55:59 2011 +0300 +++ b/.emacs-my Sat Jun 25 23:04:25 2011 +0300 @@ -253,7 +253,7 @@ (require 'server) (when (and (= emacs-major-version 23) (>= emacs-minor-version 1) (<= emacs-minor-version 2) (equal window-system 'w32)) (defun server-ensure-safe-dir (dir) "Noop" t)) ; Suppress error directory ~/.emacs.d/server is unsafe on windows. - (unless (or (<= emacs-major-version 22) (server-running-p server-name)) + (when (or (= emacs-major-version 22) (not (eq (server-running-p server-name) t))) (server-start)) )