Move .emacs files to user-emacs-directory.
--- 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)
--- a/.emacs-my Thu Feb 19 19:40:37 2015 +0200
+++ b/.emacs-my Tue Feb 24 01:27:49 2015 +0200
@@ -956,6 +956,7 @@
(message "dired")
(setq-default save-place t)
+;; `save-place-file' in ".emacs".
(require 'saveplace)
(require 'dired)
@@ -3013,7 +3014,7 @@
(setq desktop-base-file-name ".emacs.desktop-cygwin")
(setq desktop-base-lock-name ".emacs.desktop-cygwin.lock")
)
-(setq desktop-dirname my-lisp-dir)
+(setq desktop-dirname user-emacs-directory)
(when (>= emacs-major-version 22)
(require 'desktop)
--- a/Makefile Thu Feb 19 19:40:37 2015 +0200
+++ b/Makefile Tue Feb 24 01:27:49 2015 +0200
@@ -95,8 +95,14 @@
mv ~/.emacs-post $(mylispdir) || true; \
mv ~/.emacs-places $(mylispdir) || true; \
mv ~/.emacs.desktop $(mylispdir) || true; \
+ mv ~/.emacs.bmk $(mylispdir) || true; \
rm -f ~/.emacs-autogen; \
fi
+ \
+rm -f ~/.emacs ~/.emacs-places; \
+for f in $(mylispdir)/.emacs*; do \
+ mv $$f $(emacsdir) || true; \
+done
.PHONY: install-all
install-all: install
@@ -110,7 +116,7 @@
for file in .emacs-pre .emacs-post; do \
[ -f $(mylispdir)/$$file ] || cp $$file $(mylispdir)/$$file; \
done
- cp .emacs $(HOME)/.emacs
+ cp .emacs $(emacsdir)/init.el
cp .emacs-my $(mylispdir)/.emacs-my
mkdir -p $(HOME)/.gnus/scores
cp all.SCORE $(HOME)/.gnus/scores