# HG changeset patch # User Oleksandr Gavenko # Date 1274044162 -10800 # Node ID 26000ae031df5c189a7559129db15f5b85007b29 # Parent d61236d0cd38df9743e07747068599ae2ffb9424# Parent 47a3e4de976ef59ef0320485521c7152ddbc7286 merged diff -r d61236d0cd38 -r 26000ae031df .emacs-my --- a/.emacs-my Mon May 17 00:08:36 2010 +0300 +++ b/.emacs-my Mon May 17 00:09:22 2010 +0300 @@ -154,7 +154,7 @@ (when (>= emacs-major-version 22) (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) (>= 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. (server-start) )