1
0
mirror of https://github.com/sellout/emacs-color-theme-solarized.git synced 2024-06-22 07:16:41 +02:00

Make 'which-flet' a macro.

I started getting the "Invalid function: (find-color ...." error on Emacs 24.3.1
after an update and this change fixed it.
This commit is contained in:
Mikhail Glushenkov 2014-07-07 03:15:15 +02:00
parent 6a2c7ca018
commit 1dd750a925

View File

@ -77,13 +77,15 @@ the \"Gen RGB\" column in solarized-definitions.el to improve them further."
column is a different set, one of which will be chosen based on term column is a different set, one of which will be chosen based on term
capabilities, etc.") capabilities, etc.")
(defvar which-flet
"This variable will store either flet or cl-flet depending on the Emacs (defmacro which-flet (bindings &rest body)
version. flet was deprecated in in 24.3") "This macro will expand either to flet or cl-flet depending on
(if (or (> emacs-major-version 24) the Emacs version. flet was deprecated in in 24.3"
(and (>= emacs-major-version 24) (> emacs-minor-version 2))) (eval-when-compile
(fset 'which-flet 'cl-flet) (if (or (> emacs-major-version 24)
(fset 'which-flet 'flet)) (and (>= emacs-major-version 24) (> emacs-minor-version 2)))
`(cl-flet ,bindings ,@body)
`(flet ,bindings ,@body))))
(defun solarized-color-definitions (mode) (defun solarized-color-definitions (mode)
(which-flet ((find-color (name) (which-flet ((find-color (name)