diff -r cb42c2651d3f -r 0eccf022ee90 .emacs-my
--- a/.emacs-my	Tue Aug 14 12:27:32 2012 +0300
+++ b/.emacs-my	Tue Aug 14 17:39:13 2012 +0300
@@ -2378,20 +2378,6 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Save and restore my buffers every time.
 
-(setq
- desktop-globals-to-save
- (append
-  '((file-name-history . 100)
-    (compile-history . 100)
-    (command-history . 100)
-    (extended-command-history . 100)
-    (shell-command-history . 100)
-    (query-replace-history . 100)
-    (regexp-history . 100)
-    (grep-history . 100)
-    (minibuffer-history . 100))
-  desktop-globals-to-save))
-
 (setq desktop-base-file-name ".emacs.desktop")
 (setq desktop-base-lock-name ".emacs.desktop.lock")
 (when (eq system-type 'cygwin)
@@ -2401,6 +2387,19 @@
 
 (when (>= emacs-major-version 22)
   (desktop-save-mode 1)
+  (setq
+   desktop-globals-to-save
+   (append
+    '((file-name-history . 100)
+      (compile-history . 100)
+      (command-history . 100)
+      (extended-command-history . 100)
+      (shell-command-history . 100)
+      (query-replace-history . 100)
+      (regexp-history . 100)
+      (grep-history . 100)
+      (minibuffer-history . 100))
+    desktop-globals-to-save))
   )
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;