merged with master

This commit is contained in:
Sameer Rahmani 2018-12-25 12:21:12 +00:00
parent 91b35718bc
commit 5301af3ea3
3 changed files with 13 additions and 9 deletions

View File

@ -1,5 +1,4 @@
(add-to-list 'load-path (concat (getenv "FG42_HOME") "/lib")) (add-to-list 'load-path (concat (getenv "FG42_HOME") "/lib"))
;; DEBUG ;; DEBUG
;; ===== ;; =====
;; Uncomment the below code to trigger stacktraces in case of any errors ;; Uncomment the below code to trigger stacktraces in case of any errors

View File

@ -17,8 +17,8 @@
(add-hook 'cider-mode-hook #'eldoc-mode) (add-hook 'cider-mode-hook #'eldoc-mode)
(add-hook 'cider-mode-hook #'set-clojure-favorite-buffer) (add-hook 'cider-mode-hook #'set-clojure-favorite-buffer)
(add-hook 'clojure-mode-hook #'paredit-mode) (add-hook 'clojure-mode-hook #'paredit-mode)
(add-hook 'clojure-mode-hook #'rainbow-delimiters-mode)
(setq cider-cljs-lein-repl "(do (use 'figwheel-sidecar.repl-api) (start-figwheel!) (cljs-repl))") (setq cider-cljs-lein-repl "(do (use 'figwheel-sidecar.repl-api) (start-figwheel!) (cljs-repl))")
@ -26,7 +26,8 @@
(setq tmp-directory (concat (getenv "HOME") "/.tmp"))) (setq tmp-directory (concat (getenv "HOME") "/.tmp")))
(with-ability parinfer () (with-ability parinfer ()
(add-hook 'clojure-mode-hook #'parinfer-mode)) (add-hook 'clojure-mode-hook #'parinfer-mode))
(ability clojure-completion ('code-completion) (ability clojure-completion ('code-completion)
;; company mode for completion ;; company mode for completion

View File

@ -44,6 +44,7 @@
(require 'projects/configuration)) (require 'projects/configuration))
(ability bookmarks () (ability bookmarks ()
(setq bm-restore-repository-on-load t)
(require 'bm) (require 'bm)
@ -69,11 +70,12 @@
(setq-default bm-buffer-persistence t) (setq-default bm-buffer-persistence t)
(setq bm-repository-file (locate-user-emacs-file "bm-repository")) (setq bm-repository-file (locate-user-emacs-file "bm-repository"))
(add-hook' after-init-hook 'bm-repository-load)
(add-hook 'kill-buffer-hook #'bm-buffer-save) ;; (add-hook' after-init-hook 'bm-repository-load)
;; Restoring bookmarks ;; (add-hook 'kill-buffer-hook #'bm-buffer-save)
(add-hook 'find-file-hooks #'bm-buffer-restore) ;; ;; Restoring bookmarks
(add-hook 'after-revert-hook #'bm-buffer-restore) ;; (add-hook 'find-file-hooks #'bm-buffer-restore)
;; (add-hook 'after-revert-hook #'bm-buffer-restore)
;; The `after-revert-hook' is not necessary to use to achieve persistence, ;; The `after-revert-hook' is not necessary to use to achieve persistence,
;; but it makes the bookmark data in repository more in sync with the file ;; but it makes the bookmark data in repository more in sync with the file
@ -83,7 +85,9 @@
;; called before the buffer is reverted (like `vc-before-checkin-hook'). ;; called before the buffer is reverted (like `vc-before-checkin-hook').
;; Then new bookmarks can be saved before the buffer is reverted. ;; Then new bookmarks can be saved before the buffer is reverted.
;; Make sure bookmarks is saved before check-in (and revert-buffer) ;; Make sure bookmarks is saved before check-in (and revert-buffer)
(add-hook 'vc-before-checkin-hook #'bm-buffer-save) ;; (add-hook 'vc-before-checkin-hook #'bm-buffer-save)
(add-hook' after-init-hook 'bm-repository-load)
(add-hook 'kill-emacs-hook '(lambda nil (add-hook 'kill-emacs-hook '(lambda nil
(bm-buffer-save-all) (bm-buffer-save-all)
(bm-repository-save)))) (bm-repository-save))))