--- a/.emacs-my	Sat Nov 05 22:28:34 2011 +0200
+++ b/.emacs-my	Sun Nov 06 00:06:18 2011 +0200
@@ -12,6 +12,10 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "recentf")
 
+(setq recentf-save-file "~/.recentf")
+(when (eq system-type 'cygwin)
+  (setq recentf-save-file "~/.recentf-cygwin")
+  )
 (require 'recentf)
 ;; Prevent TRAMP to login on remote host when loading.
 ;; Its take time and ask passwords!
@@ -356,7 +360,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 (message "server")
 
-(when (>= emacs-major-version 22)
+(when (and (>= emacs-major-version 22) (not (eq system-type 'cygwin)))
   (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.
@@ -1926,7 +1930,14 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Save and restore my buffers every time.
-(setq desktop-dirname "~/.emacs.d")
+
+(setq desktop-base-file-name ".emacs.desktop")
+(setq desktop-base-lock-name ".emacs.desktop.lock")
+(when (eq system-type 'cygwin)
+  (setq desktop-base-file-name ".emacs.desktop-cygwin")
+  (setq desktop-base-lock-name ".emacs.desktop-cygwin.lock")
+  )
+
 (when (>= emacs-major-version 22)
   (desktop-save-mode 1)
   )