[O] Agenda breaks on holidays

[Tory S. Anderson]

The following error appears and kills agenda generation whenever the span 
includes a holiday (including Christmas and New Years)

    cl-return-from: No catch for tag: --cl-block-nil--, org-agenda-date-weekend

It seems to come from this line from my init, originally from 
https://julien.danjou.info/blog/2010/org-mode-and-holidays: 

    ;; Holiday/weekends in agenda
    ;;; Agenda holiday display
    (setq org-agenda-day-face-function
          (defun jd:org-agenda-day-face-holidays-function (date)
            "Compute DATE face for holidays."
            (unless (org-agenda-todayp date)
              (dolist (file (org-agenda-files nil 'ifmode))
                (let ((face
                       (dolist (entry (org-agenda-get-day-entries file date))
                         (let ((category (with-temp-buffer
                                           (insert entry)
                                           (org-get-category (point-min)))))
                           (when (or (string= "Holiday" category)
                                     (string= "Vacation" category))
                             (return 'org-agenda-date-weekend))))))
                  (when face (return face)))))))

Is there a simple way to get this working (showing a new face for 
weekends/holidays)?