--- a/.emacs Sun Mar 01 13:09:44 2015 +0200
+++ b/.emacs Sun Mar 01 13:10:30 2015 +0200
@@ -9,44 +9,8 @@
;; ======================================================================
;; Load path.
-
-(defvar my-usr-lisp-dir
- (expand-file-name "~/usr/share/emacs/site-lisp")
- "Here live additional lisp packages.")
-(when (file-directory-p my-usr-lisp-dir)
- (add-to-list 'load-path my-usr-lisp-dir)
- (let ((default-directory my-usr-lisp-dir))
- (normal-top-level-add-subdirs-to-load-path)))
-
-(unless (boundp 'user-emacs-directory)
- (setq user-emacs-directory "~/.emacs.d/"))
-
-(defvar my-lisp-dir
- (expand-file-name (concat user-emacs-directory "my/"))
- "Here live my lisp packages.")
-(add-to-list 'load-path my-lisp-dir)
-
-(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")
- "Path to autoload for mode files.")
-(defvar my-lisp-auth (concat user-emacs-directory ".emacs-auth")
- "Path to auth info for Emacs.")
-(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 user-emacs-directory ".emacs-pre")
- "Path to file with pre-settings. Intended for local modifications.")
-(defvar my-lisp-dotemacs (concat user-emacs-directory ".emacs-my")
- "Path to file with settings. Overwritten on install.")
-(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 user-emacs-directory ".emacs-places"))
-(setq bookmark-default-file (concat user-emacs-directory ".emacs.bmk"))
-(setq ido-save-directory-list-file (concat user-emacs-directory ".ido.last"))
+(load "~/.emacs.d/.emacs-defs")
+(my-load.add-my-loadpaths)
(mapc
(lambda (fname)