Merge branch 'master' of github.com:sellout/emacs-color-theme-solarized

This commit is contained in:
Greg Pfeil 2015-04-27 20:31:38 -06:00
commit 99067d083b
2 changed files with 16 additions and 7 deletions

View File

@ -53,9 +53,9 @@ This allows you to have a mix of light and dark frames. I tend to use light fram
```common-lisp
(add-hook 'after-make-frame-functions
(lambda (frame)
(set-frame-parameter frame
'background-mode
(if (display-graphic-p frame) 'light 'dark))
(let ((mode (if (display-graphic-p frame) 'light 'dark)))
(set-frame-parameter frame 'background-mode mode)
(set-terminal-parameter frame 'background-mode mode))
(enable-theme 'solarized)))
```

View File

@ -1,8 +1,7 @@
(eval-when-compile
(unless (require 'cl-lib nil t)
(require 'cl)
(defalias 'cl-case 'case)
(defalias 'cl-copy-list 'copy-list))
(defalias 'cl-case 'case))
)
(defconst solarized-description
@ -93,7 +92,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(defun solarized-face-for-index (facespec index &optional light)
"Creates a face from facespec where the colors use the names from
`solarized-colors`."
(let ((new-fontspec (cl-copy-list facespec)))
(let ((new-fontspec (copy-sequence facespec)))
(dolist (property '(:foreground :background :color))
(let ((color-name (plist-get new-fontspec property)))
(when color-name
@ -739,7 +738,17 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(company-scrollbar-bg (,@bg-base02))
(company-preview (,@bg-green))
(company-preview-common (,@bg-base02))
(company-template-field (,@fg-base03 ,@bg-yellow)))))))
(company-template-field (,@fg-base03 ,@bg-yellow))
;; hydra
(hydra-face-red (,@fmt-bold ,@fg-red))
(hydra-face-blue (,@fmt-bold ,@fg-blue))
(hydra-face-amaranth (,@fmt-bold ,@fg-orange))
(hydra-face-pink (,@fmt-bold ,@fg-magenta))
(hydra-face-teal (,@fmt-bold ,@fg-cyan))
;; guide-key
(guide-key/prefix-command-face (,@fg-blue))
(guide-key/highlight-command-face (,@fg-orange))
(guide-key/key-face (,@fg-green)))))))
;;;###autoload
(when (boundp 'custom-theme-load-path)