emacs
/
emacs-color-theme-solarized
mirror of https://github.com/sellout/emacs-color-theme-solarized.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Make the fmt definitions play more nicely with face merging. 

I fear that this might break things, because I ended up overspecifying
fmts originally due to new facespecs apparently updating (rather than
replacing) old ones. So, perhaps that was older versions of Emacs or
something.

Regardless, we’ll see how this flies.
This commit is contained in:
Greg Pfeil 2015-04-02 00:04:11 -06:00
parent fbe7554c95
commit 5b926875e8
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
solarized-definitions.el
View File

@ -159,11 +159,11 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
,(solarized-face-for-index facespec 5 t)))))
(defun solarized-color-definitions ()
(let ((bold (if solarized-bold 'bold 'normal))
(bright-bold (if solarized-bold 'normal 'bold))
(underline (if solarized-underline t nil))
(opt-under nil)
(italic (if solarized-italic 'italic 'normal)))
(let ((bold (if solarized-bold 'bold 'unspecified))
(bright-bold (if solarized-bold 'unspecified 'bold))
(underline (if solarized-underline t 'unspecified))
(opt-under 'unspecified)
(italic (if solarized-italic 'italic 'unspecified)))
(cond ((eq 'high solarized-contrast)
(let ((orig-base3 base3))
(rotatef base01 base00 base0 base1 base2 base3)
@ -206,23 +206,23 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(fg-blue '(:foreground blue))
(fg-cyan '(:foreground cyan))
(fmt-none `(:weight normal :slant normal :underline nil :inverse-video nil))
(fmt-bold `(:weight ,bold :slant normal :underline nil :inverse-video nil))
(fmt-bldi `(:weight ,bold :underline nil :inverse-video nil))
(fmt-undr `(:weight normal :slant normal :underline ,underline :inverse-video nil))
(fmt-undb `(:weight ,bold :slant normal :underline ,underline :inverse-video nil))
(fmt-undi `(:weight normal :underline ,underline :inverse-video nil))
(fmt-uopt `(:weight normal :slant normal :underline ,opt-under :inverse-video nil))
(fmt-none `())
(fmt-bold `(:weight ,bold))
(fmt-bldi `(:weight ,bold :slant ,italic))
(fmt-undr `( :underline ,underline))
(fmt-undb `(:weight ,bold :underline ,underline))
(fmt-undi `( :slant ,italic :underline ,underline))
(fmt-uopt `( :underline ,opt-under))
;; FIXME: don’t hardcode the SRGB color names
(fmt-curl-red `(:weight normal :slant normal :underline (:color "#dc322f" :style wave) :inverse-video nil))
(fmt-curl-yellow `(:weight normal :slant normal :underline (:color "#b58900" :style wave) :inverse-video nil))
(fmt-ital `(:weight normal :slant ,italic :underline nil :inverse-video nil))
(fmt-curl-red `( :underline (:color "#dc322f" :style wave)))
(fmt-curl-yellow `( :underline (:color "#b58900" :style wave)))
(fmt-ital `( :slant ,italic))
;; FIXME: not quite the same
(fmt-stnd `(:weight normal :slant normal :underline nil :inverse-video t))
(fmt-revr `(:weight normal :slant normal :underline nil :inverse-video t))
(fmt-revb `(:weight ,bold :slant normal :underline nil :inverse-video t))
(fmt-revbb `(:weight ,bright-bold :slant normal :underline nil :inverse-video t))
(fmt-revbbu `(:weight ,bright-bold :slant normal :underline ,underline :inverse-video t)))
(fmt-stnd `( :inverse-video t))
(fmt-revr `( :inverse-video t))
(fmt-revb `(:weight ,bold :inverse-video t))
(fmt-revbb `(:weight ,bright-bold :inverse-video t))
(fmt-revbbu `(:weight ,bright-bold :underline ,underline :inverse-video t)))
(eval-after-load 'ansi-color
'(setf ansi-color-names-vector [,base02 ,red ,green ,yellow ,blue ,magenta ,cyan ,base00]))
(mapcar (lambda (face) (apply 'create-face-spec face))