Merge branch 'main' of git.sr.ht:~marcuskammer/emacs.d

This commit is contained in:
Marcus Kammer 2024-12-04 16:48:53 +01:00
commit 60287b2ecf

View file

@ -1874,7 +1874,7 @@ Uses `mk/hyperspec-dir-locations' to find the directory."
;; (append '((restclient . t)) org-babel-load-languages)) ;; (append '((restclient . t)) org-babel-load-languages))
;; This assumes you've installed the package via MELPA. ;; This assumes you've installed the package via MELPA.
(if (display-graphic-p)
(use-package ligature (use-package ligature
:config :config
;; Enable the "www" ligature in every possible major mode ;; Enable the "www" ligature in every possible major mode
@ -1895,10 +1895,10 @@ Uses `mk/hyperspec-dir-locations' to find the directory."
"<$" "<=" "<>" "<-" "<<" "<+" "</" "#{" "#[" "#:" "#=" "#!" "<$" "<=" "<>" "<-" "<<" "<+" "</" "#{" "#[" "#:" "#=" "#!"
"##" "#(" "#?" "#_" "%%" ".=" ".-" ".." ".?" "+>" "++" "?:" "##" "#(" "#?" "#_" "%%" ".=" ".-" ".." ".?" "+>" "++" "?:"
"?=" "?." "??" "/*" "/=" "/>" "//" "__" "~~" "(*" "*)" "?=" "?." "??" "/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
"\\\\" "://" "++")) "\\\\" "://"))
;; Enables ligature checks globally in all buffers. You can also do it ;; Enables ligature checks globally in all buffers. You can also do it
;; per mode with `ligature-mode'. ;; per mode with `ligature-mode'.
(global-ligature-mode t))) (global-ligature-mode t))
(let ((bundle-dir (expand-file-name "~/.emacs.d/bundle/"))) (let ((bundle-dir (expand-file-name "~/.emacs.d/bundle/")))
(when (file-directory-p bundle-dir) (when (file-directory-p bundle-dir)