equal
deleted
inserted
replaced
244 |
244 |
245 (when (>= emacs-major-version 22) |
245 (when (>= emacs-major-version 22) |
246 (require 'server) |
246 (require 'server) |
247 (when (and (= emacs-major-version 23) (>= emacs-minor-version 1) (<= emacs-minor-version 2) (equal window-system 'w32)) |
247 (when (and (= emacs-major-version 23) (>= emacs-minor-version 1) (<= emacs-minor-version 2) (equal window-system 'w32)) |
248 (defun server-ensure-safe-dir (dir) "Noop" t)) ; Suppress error directory ~/.emacs.d/server is unsafe on windows. |
248 (defun server-ensure-safe-dir (dir) "Noop" t)) ; Suppress error directory ~/.emacs.d/server is unsafe on windows. |
249 (unless (server-running-p server-name) |
249 (unless (or (<= emacs-major-version 22) (server-running-p server-name)) |
250 (server-start)) |
250 (server-start)) |
251 ) |
251 ) |
252 |
252 |
253 ;; (desktop-load-default) |
253 ;;; ---------------------------------------------------------------- |
254 ;; (desktop-read) |
254 ;; Save and restore my buffers every time. |
|
255 (setq desktop-dirname "~/.emacs.d") |
|
256 (when (>= emacs-major-version 22) |
|
257 (desktop-save-mode 1) |
|
258 ) |
255 |
259 |
256 ;;; ---------------------------------------------------------------- |
260 ;;; ---------------------------------------------------------------- |
257 (message "standart/general settings") |
261 (message "standart/general settings") |
258 |
262 |
259 (when (boundp 'confirm-kill-emacs) |
263 (when (boundp 'confirm-kill-emacs) |