equal
deleted
inserted
replaced
151 ;; (require 'gnuserv) |
151 ;; (require 'gnuserv) |
152 ;; (setq gnuserv-frame (selected-frame)) |
152 ;; (setq gnuserv-frame (selected-frame)) |
153 |
153 |
154 (when (>= emacs-major-version 22) |
154 (when (>= emacs-major-version 22) |
155 (require 'server) |
155 (require 'server) |
156 (when (and (= emacs-major-version 23) (=> emacs-minor-version 1) (=< emacs-minor-version 2) (equal window-system 'w32)) |
156 (when (and (= emacs-major-version 23) (>= emacs-minor-version 1) (<= emacs-minor-version 2) (equal window-system 'w32)) |
157 (defun server-ensure-safe-dir (dir) "Noop" t)) ; Suppress error directory ~/.emacs.d/server is unsafe on windows. |
157 (defun server-ensure-safe-dir (dir) "Noop" t)) ; Suppress error directory ~/.emacs.d/server is unsafe on windows. |
158 (server-start) |
158 (server-start) |
159 ) |
159 ) |
160 |
160 |
161 ;; (desktop-load-default) |
161 ;; (desktop-load-default) |