# HG changeset patch # User Oleksandr Gavenko # Date 1273656271 -10800 # Node ID 03d8b85ff8159b9d133a885507e190639b2bd9b7 # Parent 83d5019523566c7e0a5f3229f9fb726ba1bb3553 Do not load server.el for Emacs 21.x. diff -r 83d501952356 -r 03d8b85ff815 .emacs-my --- a/.emacs-my Tue May 11 12:36:45 2010 +0300 +++ b/.emacs-my Wed May 12 12:24:31 2010 +0300 @@ -151,12 +151,12 @@ ;; (require 'gnuserv) ;; (setq gnuserv-frame (selected-frame)) -(require 'server) -(when (and (= emacs-major-version 23) (= emacs-minor-version 1) (equal window-system 'w32)) - (defun server-ensure-safe-dir (dir) "Noop" t)) ; Suppress error directory ~/.emacs.d/server is unsafe on windows. - (when (>= emacs-major-version 22) - (server-start)) + (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. + (server-start) + ) ;; (desktop-load-default) ;; (desktop-read)