mirror of
https://github.com/pestctrl/emacs-config.git
synced 2026-06-14 12:21:20 +00:00
Compare commits
2 commits
4bc8acf8e7
...
0357dd532d
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0357dd532d | ||
|
|
e904230237 |
3 changed files with 7 additions and 4 deletions
|
|
@ -57,7 +57,10 @@
|
||||||
(cons
|
(cons
|
||||||
(decode-char 'ucs #x2997)
|
(decode-char 'ucs #x2997)
|
||||||
(decode-char 'ucs #x2997))
|
(decode-char 'ucs #x2997))
|
||||||
(font-spec :size 8 :avgwidth 8 :name "STIXGeneral" :weight 'normal)))
|
(font-spec :size 8 :avgwidth 8 :name "STIXGeneral" :weight 'normal))
|
||||||
|
(set-fontset-font "fontset-default"
|
||||||
|
'emoji
|
||||||
|
(font-spec :family "Noto Color Emoji")))
|
||||||
(set-fontset-font "fontset-default"
|
(set-fontset-font "fontset-default"
|
||||||
(cons
|
(cons
|
||||||
(decode-char 'ucs #x2500)
|
(decode-char 'ucs #x2500)
|
||||||
|
|
|
||||||
|
|
@ -204,7 +204,7 @@
|
||||||
|
|
||||||
(defvar clang/detect-extensions-function nil)
|
(defvar clang/detect-extensions-function nil)
|
||||||
|
|
||||||
(cl-defun clang/get-clang-options (&key filename compiler action)
|
(cl-defun clang/get-clang-options (&key filename compiler)
|
||||||
(interactive)
|
(interactive)
|
||||||
(let* ((filename (or filename (buffer-file-name)))
|
(let* ((filename (or filename (buffer-file-name)))
|
||||||
(target-str (comp-dev/conf-get 'target))
|
(target-str (comp-dev/conf-get 'target))
|
||||||
|
|
@ -213,7 +213,7 @@
|
||||||
(clang/get-clang-options-for-target target))
|
(clang/get-clang-options-for-target target))
|
||||||
(detected-extensions
|
(detected-extensions
|
||||||
(awhen clang/detect-extensions-function
|
(awhen clang/detect-extensions-function
|
||||||
(funcall it compiler action filename target-str))))
|
(funcall it compiler filename target-str))))
|
||||||
(cos/to-string
|
(cos/to-string
|
||||||
(clang/clang-options-merge
|
(clang/clang-options-merge
|
||||||
(car options-config)
|
(car options-config)
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 298c9aebef91c503a13e84a12a0bc4bef1e24626
|
Subproject commit e1024b2d6047bda013b9c2a1bb197133064bc156
|
||||||
Loading…
Reference in a new issue