Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow Emacs 24 "deftheme" mechanism. #2

Merged
merged 2 commits into from Apr 2, 2013
Merged

Allow Emacs 24 "deftheme" mechanism. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aa91ff
Allow color-theme or deftheme switching.
Apr 2, 2013
ef57161
Update README.md to include theme mode selection.
Apr 2, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 7 additions & 0 deletions README.md
View file
Open in desktop
Expand Up @@ -21,3 +21,10 @@ Note: you may need to add the repository path to your loadpath. For
example:

(add-to-list 'load-path "~/.emacs.d/elisp/theme-changer")

If you want to use the Emacs 24 "deftheme" color theme facility
instead of the color-theme package, specify this (and use the correct
names for the themes):

(setq theme-changer-mode "deftheme")
(change-theme 'solarized-light 'solarized-dark)
23 changes: 21 additions & 2 deletions theme-changer.el
View file
Open in desktop
Expand Up @@ -44,11 +44,21 @@
;; You may need to add this file path to your loadpath. For example:
;; (add-to-list 'load-path "~/.emacs.d/elisp/theme-changer")

;; If you want to use the Emacs 24 "deftheme" color theme facility
;; instead of the color-theme package, specify this (and use the
;; correct names for the themes):
;; (setq theme-changer-mode "deftheme")
;; (change-theme 'solarized-light 'solarized-dark)

;;; Code:

(require 'cl)
(require 'solar)

(defvar theme-changer-mode "color-theme"
"Specify the theme change mode: \"color-theme\" or Emacs 24's
\"deftheme\".")

(defun hour-fraction-to-time (date hour-fraction)
(let*
((now (decode-time (current-time)))
Expand Down Expand Up @@ -90,6 +100,15 @@
(defun +second (time)
(time-add time (seconds-to-time 1)))

(defun switch-theme (old new)
"Change the theme from OLD to NEW, using Emacs 24's built-in
theme facility (\"deftheme\") or color-theme."
(if (string= theme-changer-mode "deftheme")
(progn
(disable-theme old)
(load-theme new t))
(apply (symbol-function new) '())))

(defun change-theme (day-theme night-theme)
(let*
((now (current-time))
Expand All @@ -103,11 +122,11 @@

(if (daytime-p sunrise-today sunset-today)
(progn
(apply (symbol-function day-theme) '())
(switch-theme night-theme day-theme)
(run-at-time (+second sunset-today) nil
'change-theme day-theme night-theme))

(apply (symbol-function night-theme) '())
(switch-theme day-theme night-theme)
(if (time-less-p now sunrise-today)
(run-at-time (+second sunrise-today) nil
'change-theme day-theme night-theme)
Expand Down