From mboxrd@z Thu Jan  1 00:00:00 1970
From: torys.anderson@gmail.com (Tory S. Anderson)
Subject: Agenda breaks on holidays
Date: Mon, 29 Dec 2014 11:13:30 -0500
Message-ID: <87sifysac5.fsf@gmail.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:55127)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <torys.anderson@gmail.com>) id 1Y5cwn-0007tw-Ep
	for emacs-orgmode@gnu.org; Mon, 29 Dec 2014 11:13:34 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <torys.anderson@gmail.com>) id 1Y5cwm-0000AA-JN
	for emacs-orgmode@gnu.org; Mon, 29 Dec 2014 11:13:33 -0500
Received: from mail-yh0-x233.google.com ([2607:f8b0:4002:c01::233]:46521)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <torys.anderson@gmail.com>) id 1Y5cwm-00009y-G8
	for emacs-orgmode@gnu.org; Mon, 29 Dec 2014 11:13:32 -0500
Received: by mail-yh0-f51.google.com with SMTP id a41so6678961yho.38
	for <emacs-orgmode@gnu.org>; Mon, 29 Dec 2014 08:13:31 -0800 (PST)
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: orgmode list <emacs-orgmode@gnu.org>

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)?