From 8cc9201977ead6fb72e74ece8063b975fcc306bd Mon Sep 17 00:00:00 2001 From: Case Duckworth Date: Mon, 8 Feb 2021 07:45:16 -0600 Subject: [PATCH] Merge branch 'main' of tildegit.org:acdw/emacs --- config.org | 2 +- early-init.el | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/config.org b/config.org index bdbc1e0..9533828 100644 --- a/config.org +++ b/config.org @@ -2291,7 +2291,7 @@ from [[https://github.com/KaratasFurkan/.emacs.d#org-1][Furkan Karataş]]. #+begin_src emacs-lisp :noweb-ref settings (setq-default org-appear-autoemphasis t - org-appear-autolinks t + org-appear-autolinks nil org-appear-autosubmarkers t) #+end_src diff --git a/early-init.el b/early-init.el index 1c2492e..b208092 100644 --- a/early-init.el +++ b/early-init.el @@ -19,11 +19,13 @@ (dolist (path (list ;; Windows (expand-file-name "exe" win-app-dir) + (expand-file-name "exe/bin" win-app-dir) (expand-file-name "Git/bin" win-app-dir) (expand-file-name "Git/usr/bin" win-app-dir) (expand-file-name "Git/mingw64/bin" win-app-dir) (expand-file-name "Everything" win-app-dir) (expand-file-name "Win-builds/bin" win-app-dir) + (expand-file-name "Z/bin" win-app-dir) ;; Linux (expand-file-name "bin" user-emacs-directory) (expand-file-name "~/bin")