summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorCase Duckworth2021-02-08 07:45:16 -0600
committerCase Duckworth2021-02-08 07:45:16 -0600
commit8cc9201977ead6fb72e74ece8063b975fcc306bd (patch)
treefa8ff43413e166a695307b3e2f0a8e7a3c0e6a29
parentMerge branch 'main' of tildegit.org:acdw/emacs (diff)
downloademacs-8cc9201977ead6fb72e74ece8063b975fcc306bd.tar.gz
emacs-8cc9201977ead6fb72e74ece8063b975fcc306bd.zip
Merge branch 'main' of tildegit.org:acdw/emacs
-rw-r--r--config.org2
-rw-r--r--early-init.el2
2 files changed, 3 insertions, 1 deletions
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ş]].
2291 2291
2292#+begin_src emacs-lisp :noweb-ref settings 2292#+begin_src emacs-lisp :noweb-ref settings
2293 (setq-default org-appear-autoemphasis t 2293 (setq-default org-appear-autoemphasis t
2294 org-appear-autolinks t 2294 org-appear-autolinks nil
2295 org-appear-autosubmarkers t) 2295 org-appear-autosubmarkers t)
2296#+end_src 2296#+end_src
2297 2297
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 @@
19 (dolist (path (list 19 (dolist (path (list
20 ;; Windows 20 ;; Windows
21 (expand-file-name "exe" win-app-dir) 21 (expand-file-name "exe" win-app-dir)
22 (expand-file-name "exe/bin" win-app-dir)
22 (expand-file-name "Git/bin" win-app-dir) 23 (expand-file-name "Git/bin" win-app-dir)
23 (expand-file-name "Git/usr/bin" win-app-dir) 24 (expand-file-name "Git/usr/bin" win-app-dir)
24 (expand-file-name "Git/mingw64/bin" win-app-dir) 25 (expand-file-name "Git/mingw64/bin" win-app-dir)
25 (expand-file-name "Everything" win-app-dir) 26 (expand-file-name "Everything" win-app-dir)
26 (expand-file-name "Win-builds/bin" win-app-dir) 27 (expand-file-name "Win-builds/bin" win-app-dir)
28 (expand-file-name "Z/bin" win-app-dir)
27 ;; Linux 29 ;; Linux
28 (expand-file-name "bin" user-emacs-directory) 30 (expand-file-name "bin" user-emacs-directory)
29 (expand-file-name "~/bin") 31 (expand-file-name "~/bin")