Lots of changes, maybe breaking something

I have to do a big debugging tonight.  Keybinds aren't getting picked up, idk
what's going on.

1 files changed, 7 insertions, 1 deletions

@@ -19,6 +19,8 @@
 
 ;;; Code:
 
+(require 'diary-lib)
+
 ;;; Define a directory and an expanding function
 
 (defmacro +define-dir (name directory &optional docstring inhibit-mkdir)
@@ -94,7 +96,11 @@ itself."
       ;; sunset-command.
       (funcall sunset-command)
       (run-at-time sunrise nil sunrise-command))
-     ((time-less-p nil sunset-time) (run-at-time sunset nil sunset-command))
+     ((time-less-p nil sunset-time)
+      ;; If it isn't sunset yet, it's still light---so we need to run the
+      ;; sunrise-command.
+      (funcall sunrise-command)
+      (run-at-time sunset nil sunset-command))
      (t (run-at-time "12:00am" nil sunset-command)))
     ;; Reset everything at midnight
     (unless reset