Restructred history settings using noweb references

1 files changed, 30 insertions, 22 deletions

diff --git a/emacs-config.org b/emacs-config.org
index 6a4b09a..b3aa8f1 100644
--- a/emacs-config.org
+++ b/emacs-config.org
@@ -105,23 +105,25 @@ Enable which-key that displays a pop-up window of posisble keybindings sequences
 ** History
 *** Minibuffer History
 Enable saving minibuffer history.
-#+begin_src elisp
+#+begin_src elisp :noweb yes
   (savehist-mode)
+  (with-eval-after-load 'savehist
+    <<savehist-settings>>)
 #+end_src
 
 Automatically save history on exit.
-#+begin_example elisp
+#+begin_example elisp :tangle no :noweb-ref savehist-settings
   (add-hook 'kill-emacs-hook #'savehist-save)
 #+end_example
 
 Ensure savehist file is loaded.
-#+begin_src elisp
+#+begin_src elisp :tangle no :noweb-ref savehist-settings
   (unless savehist-loaded
     (load-file savehist-file))
 #+end_src
 
 Add addtional variable lists to save.
-#+begin_src elisp
+#+begin_src elisp :tangle no :noweb-ref savehist-settings
   (dolist (var '(command-history
                  register-alist
                  mark-ring
@@ -131,52 +133,58 @@ Add addtional variable lists to save.
     (cl-pushnew var savehist-additional-variables))
 #+end_src
 
-*** File History
-Enable storing history of opened files.
-#+begin_src elisp
+*** Recent Files
+Enable saving history of recent opened files.
+#+begin_src elisp :noweb yes
   (recentf-mode)
-#+end_src
-
-Disallow duplicates in history.
-#+begin_src elisp
-  (setq-default history-delete-duplicates t)
+  (with-eval-after-load 'recentf
+    <<recentf-settings>>)
 #+end_src
 
 Recentf settings.
-#+begin_src elisp
+#+begin_src elisp :tangle no :noweb-ref recentf-settings
   (setq-default
    recentf-max-saved-items 50
    recentf-auto-cleanup 'never)
 #+end_src
 
 Save recent files and cleanup file list on exit.
-#+begin_src elisp
+#+begin_src elisp :tangle no :noweb-ref recentf-settings
   (add-hook 'kill-emacs-hook #'recentf-cleanup)
   (add-hook 'kill-emacs-hook #'recentf-save-list)
 #+end_src
 
-*** Cursor Position
-Enable saving point position.
-#+begin_src elisp
+Disallow duplicates in history.
+#+begin_src elisp :tangle no :noweb-ref recentf-settings
+  (setq-default history-delete-duplicates t)
+#+end_src
+
+*** Cursor Point Position
+Enable saving cursor point positions.
+#+begin_src elisp :noweb yes
   (save-place-mode)
+  (with-eval-after-load 'saveplace
+    <<saveplace-settings>>)
 #+end_src
 
 Save place settings.
-#+begin_src elisp
+#+begin_src elisp :tangle no :noweb-ref saveplace-settings
   (setq-default
    save-place-abbreviate-file-names t
    save-place-limit 800)
 #+end_src
 
 *** Bookmarks
-Disable auto-bookmarking org-mode files.
+Don't display bookmark icon in fringe.
 #+begin_src elisp
-  (setq-default org-bookmark-names-plist nil)
+  (with-eval-after-load 'bookmark
+    (setq-default bookmark-fringe-mark nil))
 #+end_src
 
-Don't display bookmark icon in fringe.
+Disable auto-bookmarking org-mode files.
 #+begin_src elisp
-  (setq-default bookmark-fringe-mark nil)
+  (with-eval-after-load 'org
+    (setq-default org-bookmark-names-plist nil))
 #+end_src
 
 ** Org