Merge branch 'master'

.gitignore

@@ -2,6 +2,7 @@
 
 # Emacs
 *.elc
+.\#*
 custom.el
 
 # cache files

settings/general-settings.el

@@ -55,10 +55,15 @@
   (setq auto-save-file-name-transforms `((".*" ,auto-saves-dir t)))
   (setq auto-save-list-file-prefix (concat auto-saves-dir ".saves-"))
   (setq tramp-backup-directory-alist `((".*" . ,backup-dir)))
-  (setq tramp-auto-save-directory auto-saves-dir)
+  (setq tramp-auto-save-directory auto-saves-dir))
-  )
 (setq-default delete-by-moving-to-trash t)  ;; Delete files to trash
 
+(use-package tramp
+  :defer t
+  :config
+  ;; tramp-cache.el
+  (setq tramp-persistency-file-name (concat user-cache-directory "tramp")))
+
 (if (fboundp 'save-place-mode)
     (save-place-mode)
   (setq save-place t)
@@ -70,6 +75,17 @@
 (setq savehist-file (concat user-cache-directory "history"))
 (savehist-mode)
 
+(use-package x-win
+  :defer t
+  :config
+  ;; overwrite
+  (defun emacs-session-filename (session-id)
+    "Construct a filename to save the session in based on SESSION-ID.
+Return a filename in `user-emacs-directory', unless the session file
+already exists in the home directory."
+    (let ((basename (concat "session." session-id)))
+      (concat user-cache-directory basename))))
+
 ;;; desktop
 (require 'desktop)
 ;; save session

settings/multiple-cursors-settings.el

@@ -19,7 +19,9 @@
          ("M-m s m s n" . mc/insert-numbers)
          ("M-m s m s r" . set-rectangular-region-anchor)
          ("M-m s m s s" . mc/sort-regions)
-         ("M-m s m s t" . mc/reverse-regions)))
+         ("M-m s m s t" . mc/reverse-regions))
+  :config
+  (setq mc/list-file (concat user-cache-directory "mc-lists.el")))
 
 (provide 'multiple-cursors-settings)
 ;;; multiple-cursors-settings.el ends here