Skip to content

Commit

Permalink
nit: minor edits
Browse files Browse the repository at this point in the history
  • Loading branch information
abougouffa committed Mar 21, 2023
1 parent 9dd1345 commit 81dc6a6
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 20 deletions.
8 changes: 5 additions & 3 deletions core/me-loaddefs.el
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ prefix or universal argument, it waits for a moment (defined by
(autoload '+region-or-thing-at-point "../elisp/+emacs" "\
Return the region or the thing at point.")
(autoload '+webjump "../elisp/+emacs" "\
Like `webjump', with initial query filled from `thing-at-point'." t)
Like `webjump', with initial query filled from `+region-org-thing-at-point'." t)
(register-definition-prefixes "../elisp/+emacs" '("+dir-locals--autoreload-" "+screenshot-" "+webjump-read-string-"))


Expand Down Expand Up @@ -315,8 +315,10 @@ Suppress new messages temporarily in the echo area while BODY is evaluated.
Convert BODY to an interactive command.
(fn &rest BODY)" nil t)
(autoload '+set-fonts "../elisp/+minemacs" nil t)
(autoload '+load-theme "../elisp/+minemacs" nil t)
(autoload '+set-fonts "../elisp/+minemacs" "\
Set Emacs' fonts from `minemacs-fonts'." t)
(autoload '+load-theme "../elisp/+minemacs" "\
Load Emacs' theme from `minemacs-theme'." t)
(autoload '+eval-when-idle "../elisp/+minemacs" "\
Queue FNS to be processed when Emacs becomes idle.
Expand Down
2 changes: 2 additions & 0 deletions elisp/+minemacs.el
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ If NO-MESSAGE-LOG is non-nil, do not print any message to *Messages* buffer."

;;;###autoload
(defun +set-fonts ()
"Set Emacs' fonts from `minemacs-fonts'."
(interactive)
;; TODO: use (font-family-list) to check if the font is available
(custom-set-faces
Expand All @@ -98,6 +99,7 @@ If NO-MESSAGE-LOG is non-nil, do not print any message to *Messages* buffer."

;;;###autoload
(defun +load-theme ()
"Load Emacs' theme from `minemacs-theme'."
(interactive)
(when minemacs-theme
(+log! "Loading user theme: %s" minemacs-theme)
Expand Down
29 changes: 15 additions & 14 deletions modules/me-editor.el
Original file line number Diff line number Diff line change
Expand Up @@ -80,21 +80,22 @@ If doom-unicode-font is set, add it as preferred font for all unicode blocks."
;; Enable traditional ligature support in eww-mode, if the
;; `variable-pitch' face supports it
(ligature-set-ligatures 'eww-mode '("ff" "fi" "ffi"))
;; Enable all Cascadia Code ligatures in programming modes
;; Enable all "Cascadia Code" ligatures in programming modes
(ligature-set-ligatures
'prog-mode '("|||>" "<|||" "<==>" "<!--" "####" "~~>" "***" "||=" "||>"
":::" "::=" "=:=" "===" "==>" "=!=" "=>>" "=<<" "=/=" "!=="
"!!." ">=>" ">>=" ">>>" ">>-" ">->" "->>" "-->" "---" "-<<"
"<~~" "<~>" "<*>" "<||" "<|>" "<$>" "<==" "<=>" "<=<" "<->"
"<--" "<-<" "<<=" "<<-" "<<<" "<+>" "</>" "###" "#_(" "..<"
"..." "+++" "/==" "///" "_|_" "www" "&&" "^=" "~~" "~@" "~="
"~>" "~-" "**" "*>" "*/" "||" "|}" "|]" "|=" "|>" "|-" "{|"
"[|" "]#" "::" ":=" ":>" ":<" "$>" "==" "=>" "!=" "!!" ">:"
">=" ">>" ">-" "-~" "-|" "->" "--" "-<" "<~" "<*" "<|" "<:"
"<$" "<=" "<>" "<-" "<<" "<+" "</" "#{" "#[" "#:" "#=" "#!"
"##" "#(" "#?" "#_" "%%" ".=" ".-" ".." ".?" "+>" "++" "?:"
"?=" "?." "??" ";;" "/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
"\\\\" "://"))))
'prog-mode
'("|||>" "<|||" "<==>" "<!--" "####" "~~>" "***" "||=" "||>"
":::" "::=" "=:=" "===" "==>" "=!=" "=>>" "=<<" "=/=" "!=="
"!!." ">=>" ">>=" ">>>" ">>-" ">->" "->>" "-->" "---" "-<<"
"<~~" "<~>" "<*>" "<||" "<|>" "<$>" "<==" "<=>" "<=<" "<->"
"<--" "<-<" "<<=" "<<-" "<<<" "<+>" "</>" "###" "#_(" "..<"
"..." "+++" "/==" "///" "_|_" "www" "&&" "^=" "~~" "~@" "~="
"~>" "~-" "**" "*>" "*/" "||" "|}" "|]" "|=" "|>" "|-" "{|"
"[|" "]#" "::" ":=" ":>" ":<" "$>" "==" "=>" "!=" "!!" ">:"
">=" ">>" ">-" "-~" "-|" "->" "--" "-<" "<~" "<*" "<|" "<:"
"<$" "<=" "<>" "<-" "<<" "<+" "</" "#{" "#[" "#:" "#=" "#!"
"##" "#(" "#?" "#_" "%%" ".=" ".-" ".." ".?" "+>" "++" "?:"
"?=" "?." "??" ";;" "/*" "/=" "/>" "//" "__" "~~" "(*" "*)"
"\\\\" "://"))))

(use-package rainbow-delimiters
:straight t
Expand Down
5 changes: 3 additions & 2 deletions modules/me-lsp.el
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@
(lsp-eldoc-render-all nil) ; clangd docs looks ugly on eldoc-box!
(lsp-headerline-breadcrumb-enable nil)
(lsp-lens-enable nil)
;; maybe use nil and enable modes manually (lsp-completion-mode, lsp-modeline-diagnostics-mode, ...)
;; Maybe set to nil and enable modes manually (`lsp-completion-mode',
;; `lsp-modeline-diagnostics-mode', ...)
(lsp-auto-configure t)
;; Those stuff should be managed by Emacs's builtins (whitespace-cleanup, treesit, ...)
(lsp-semantic-tokens-enable nil) ; when t, hides unreachable ifdefs!
(lsp-semantic-tokens-enable t) ; when t, hides unreachable ifdefs!
(lsp-enable-on-type-formatting nil)
(lsp-enable-text-document-color nil)
(lsp-trim-trailing-whitespace nil)
Expand Down
2 changes: 1 addition & 1 deletion modules/me-ui.el
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
:init
(+map! "tm" #'mixed-pitch-mode)
:custom
(mixed-pitch-variable-pitch-cursor t)
(mixed-pitch-variable-pitch-cursor 'box)
:config
(setq mixed-pitch-fixed-pitch-faces
(delete-dups
Expand Down

0 comments on commit 81dc6a6

Please sign in to comment.