Compare commits

..

No commits in common. "c900040cd1602a1390838000e1fb3949a1d58dff" and "11c77786be35e829ff1f65c133c3118c22887f65" have entirely different histories.

3 changed files with 14 additions and 19 deletions

3
.gitmodules vendored
View file

@ -1,6 +1,3 @@
[submodule "external-packages/nerd-icons-dired"] [submodule "external-packages/nerd-icons-dired"]
path = external-packages/nerd-icons-dired path = external-packages/nerd-icons-dired
url = https://github.com/rainstormstudio/nerd-icons-dired.git url = https://github.com/rainstormstudio/nerd-icons-dired.git
[submodule "external-packages/ligature.el"]
path = external-packages/ligature.el
url = https://github.com/mickeynp/ligature.el.git

View file

@ -50,7 +50,6 @@ section of configuration.
use-short-answers t use-short-answers t
kill-do-not-save-duplicates t) kill-do-not-save-duplicates t)
(set-language-environment "UTF-8")
(set-default-coding-systems 'utf-8) (set-default-coding-systems 'utf-8)
(global-auto-revert-mode +1) (global-auto-revert-mode +1)
(delete-selection-mode +1) (delete-selection-mode +1)
@ -181,18 +180,19 @@ Configure the look and feel of Emacs
*** Font ligatures *** Font ligatures
#+begin_src emacs-lisp #+begin_src emacs-lisp
(use-package ligature (use-package ligature
:load-path "external-packages/ligature.el/" :if (package-installed-p 'ligature)
:disabled t
:functions (ligature-set-ligatures :functions (ligature-set-ligatures
global-ligature-mode) global-ligature-mode)
:config :config
(ligature-set-ligatures (ligature-set-ligatures
'(text-mode prog-mode org-mode) '(text-mode prog-mode org-mode)
'("<---" "<--" "<<-" "<-" "->" "-->" "--->" "<->" "<-->" "<--->" "<---->" "<!--" '("->" "-->" "--->" "=>" "==>" "===>"
"<==" "<===" "<=" "=>" "=>>" "==>" "===>" ">=" "<=>" "<==>" "<===>" "<====>" "<!---" "<--" "<---" "<-" "<==" "<==="
"<~~" "<~" "~>" "~~>" "::" ":::" "==" "!=" "===" "!==" "<->" "<-->" "<--->" "<---->"
":=" ":-" ":+" "<*" "<*>" "*>" "<|" "<|>" "|>" "+:" "-:" "=:" "<******>" "++" "+++")) "<=>" "<==>" "<===>" "<====>"
(ligature-set-ligatures 'markdown-mode '(("=" (rx (+ "=") (? (| ">" "<")))) "<=" ">=" "==" "!=" "===" "!==" "!==="
("-" (rx (+ "-"))))) "/*" "*/" "+++" "<~~" "~~>" "<!---" "---!>"))
(global-ligature-mode +1)) (global-ligature-mode +1))
#+end_src #+end_src
*** Font Showcase *** Font Showcase
@ -200,12 +200,12 @@ This is a showcase of various font and UI features to act as a
standard candle. standard candle.
**** Font emphasis **** Font emphasis
Examples of: Examples of:
- *Bold text* (*) - *Bold text*
- /Italic text/ (/) - /Italic text/
- _Underscored text_ (_) - _Underscored text_
- =Literal text= (=) - =Literal text=
- ~Code~ (~) - ~Code~
- +Strike-through+ (+) - +Strike-through+
**** Character showcase **** Character showcase
#+begin_example #+begin_example
ABC.DEF.GHI.JKL.MNO.PQRS.TUV.WXYZ abc.def.ghi.jkl.mno.pqrs.tuv.wxyz ABC.DEF.GHI.JKL.MNO.PQRS.TUV.WXYZ abc.def.ghi.jkl.mno.pqrs.tuv.wxyz
@ -1446,7 +1446,6 @@ Configure email with iCalendar event support, to integrate with
(project-find-regexp "Find regexp") (project-find-regexp "Find regexp")
(project-find-dir "Find directory") (project-find-dir "Find directory")
(project-eshell "Eshell") (project-eshell "Eshell")
(project-vc-dir "VC Status")
(magit-project-status "Magit"))) (magit-project-status "Magit")))
:config :config
(defun my/project-find-common-projects () (defun my/project-find-common-projects ()

@ -1 +0,0 @@
Subproject commit 6ac1634612dbd42f7eb81ecaf022bd239aabb954