# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1429046309 -10800
# Node ID 8e2c4332223d851df2ad81b82b23790a5b57540d
# Parent  0e25700290c4648079a8c5289d8cc35565a1b8ce
Use newer recommended place for bookmarks.

diff -r 0e25700290c4 -r 8e2c4332223d .emacs-defs
--- a/.emacs-defs	Wed Apr 15 00:16:53 2015 +0300
+++ b/.emacs-defs	Wed Apr 15 00:18:29 2015 +0300
@@ -28,7 +28,7 @@
 
 (setq custom-file (concat user-emacs-directory ".emacs-custom"))
 (setq save-place-file (concat user-emacs-directory ".emacs-places"))
-(setq bookmark-default-file (concat user-emacs-directory ".emacs.bmk"))
+(setq bookmark-default-file (concat user-emacs-directory "bookmarks"))
 (setq ido-save-directory-list-file (concat user-emacs-directory ".ido.last"))
 
 (defun my-load.add-my-loadpaths ()
diff -r 0e25700290c4 -r 8e2c4332223d Makefile
--- a/Makefile	Wed Apr 15 00:16:53 2015 +0300
+++ b/Makefile	Wed Apr 15 00:18:29 2015 +0300
@@ -107,7 +107,7 @@
 rm -f $(emacsdir)/autoload-my.el; \
 rm -f ~/.emacs; \
 [ -d $(emacsdir)/my-lisp ] && mv $(emacsdir)/my-lisp $(mylispdir); \
-for f in .emacs-my .emacs-custom.el .emacs-pre .emacs-post .emacs-places .emacs.desktop .emacs.bmk .emacs-places .emacs-autogen .ido.last .recentf; do \
+for f in .emacs-my .emacs-custom.el .emacs-pre .emacs-post .emacs-places .emacs.desktop .emacs-places .emacs-autogen .ido.last .recentf; do \
   if [ -f ~/$$f ]; then [ -f $(emacsdir)/$$f ] && mv ~/$$f $(emacsdir)/$$f.1 || mv ~/$$f $(emacsdir); fi; \
   if [ -f $(mylispdir)/$$f ]; then [ -f $(emacsdir)/$$f ] && mv $(mylispdir)/$$f $(emacsdir)/$$f.2 || mv $(mylispdir)/$$f $(emacsdir); fi; \
 done; \
@@ -115,6 +115,8 @@
   fn=$${f##*/}; \
   [ -f $(emacsdir)/$$fn ] && mv $$f $(emacsdir)/$$fn.3 || mv $$f $(emacsdir); \
 done; \
+if [ -f ~/.emacs.bmk ]; then [ -f $(emacsdir)/bookmarks ] && mv ~/.emacs.bmk $(emacsdir)/bookmarks.$$$$ || mv ~/.emacs.bmk $(emacsdir)/bookmarks; fi; \
+if [ -f $(emacsdir)/.emacs.bmk ]; then [ -f $(emacsdir)/bookmarks ] && mv $(emacsdir)/.emacs.bmk $(emacsdir)/bookmarks.$$$$ || mv $(emacsdir)/.emacs.bmk $(emacsdir)/bookmarks; fi; \
 echo $(COMPAT_VER) >$(COMPAT_FILE); \
 make install