--- a/.emacs Thu Feb 19 19:40:37 2015 +0200
+++ b/.emacs Tue Feb 24 01:27:49 2015 +0200
@@ -26,25 +26,26 @@
"Here live my lisp packages.")
(add-to-list 'load-path my-lisp-dir)
-(setq custom-file (concat my-lisp-dir ".emacs-custom"))
+(setq custom-file (concat user-emacs-directory ".emacs-custom"))
(if (file-exists-p custom-file)
(load custom-file))
-(defvar my-lisp-autoload (concat my-lisp-dir "loaddefs.el")
+(defvar my-lisp-autoload (concat user-emacs-directory "loaddefs.el")
"Path to autoload for mode files.")
-(defvar my-lisp-auth (concat my-lisp-dir ".emacs-auth")
+(defvar my-lisp-auth (concat user-emacs-directory ".emacs-auth")
"Path to auth info for Emacs.")
-(defvar my-lisp-autogen (concat my-lisp-dir ".emacs-autogen")
+(defvar my-lisp-autogen (concat user-emacs-directory ".emacs-autogen")
"Path to automatically generated config file. It content depend on
installation environment and it was overridden on install.")
-(defvar my-lisp-pre (concat my-lisp-dir ".emacs-pre")
+(defvar my-lisp-pre (concat user-emacs-directory ".emacs-pre")
"Path to file with pre-settings. Intended for local modifications.")
-(defvar my-lisp-dotemacs (concat my-lisp-dir ".emacs-my")
+(defvar my-lisp-dotemacs (concat user-emacs-directory ".emacs-my")
"Path to file with settings. Overwritten on install.")
-(defvar my-lisp-post (concat my-lisp-dir ".emacs-post")
+(defvar my-lisp-post (concat user-emacs-directory ".emacs-post")
"Path to file with post-settings. Intended for local modifications.")
-(setq save-place-file (concat my-lisp-dir ".emacs-places"))
+(setq save-place-file (concat user-emacs-directory ".emacs-places"))
+(setq bookmark-default-file (concat user-emacs-directory ".emacs.bmk"))
(mapc
(lambda (fname)