Added conditilan prefix thanks to @sellout

Fixed CL functions
This commit is contained in:
Igor Khomyakov 2015-01-08 12:17:25 +03:00
parent 715b3f6011
commit 14fb49335c
1 changed files with 8 additions and 4 deletions

View File

@ -1,5 +1,9 @@
(eval-when-compile (eval-when-compile
(require 'cl)) (unless (require 'cl-lib nil t)
(require 'cl)
(defalias 'cl-case 'case)
(defalias 'cl-copy-list 'copy-list))
)
(defconst solarized-description (defconst solarized-description
"Color theme by Ethan Schoonover, created 2011-03-24. "Color theme by Ethan Schoonover, created 2011-03-24.
@ -89,7 +93,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(defun solarized-face-for-index (facespec index &optional light) (defun solarized-face-for-index (facespec index &optional light)
"Creates a face from facespec where the colors use the names from "Creates a face from facespec where the colors use the names from
`solarized-colors`." `solarized-colors`."
(let ((new-fontspec (copy-list facespec))) (let ((new-fontspec (cl-copy-list facespec)))
(dolist (property '(:foreground :background :color)) (dolist (property '(:foreground :background :color))
(let ((color-name (plist-get new-fontspec property))) (let ((color-name (plist-get new-fontspec property)))
(when color-name (when color-name
@ -106,7 +110,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(setf color-name 'base03)) (setf color-name 'base03))
(when light (when light
(setf color-name (setf color-name
(case color-name (cl-case color-name
(base03 'base3) (base03 'base3)
(base02 'base2) (base02 'base2)
(base01 'base1) (base01 'base1)
@ -274,7 +278,7 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
(custom-state (,@fg-green)) (custom-state (,@fg-green))
(custom-variable-tag (,@fg-base1)) (custom-variable-tag (,@fg-base1))
;; diff - DiffAdd, DiffChange, DiffDelete, and DiffText ;; diff - DiffAdd, DiffChange, DiffDelete, and DiffText
,@(case solarized-diff-mode ,@(cl-case solarized-diff-mode
(high (high
`((diff-added (,@fmt-revr ,@fg-green)) `((diff-added (,@fmt-revr ,@fg-green))
(diff-changed (,@fmt-revr ,@fg-yellow)) (diff-changed (,@fmt-revr ,@fg-yellow))