From f6a766548c4e575fbf933aab604ba7a397848cbc Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Fri, 28 Oct 2011 14:47:32 +0200 Subject: [PATCH 1/2] Save complex heading regexp for column view * lisp/org.el (org-scan-tags): Also remember `org-complex-heading-regexp' in a property. --- lisp/org.el | 1 + 1 file changed, 1 insertion(+) diff --git a/lisp/org.el b/lisp/org.el index 2599d41d4..b55de9065 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -12698,6 +12698,7 @@ only lines with a TODO keyword are included in the output." 'mouse-face 'highlight 'org-not-done-regexp org-not-done-regexp 'org-todo-regexp org-todo-regexp + 'org-complex-heading-regexp org-complex-heading-regexp 'help-echo (format "mouse-2 or RET jump to org file %s" (abbreviate-file-name From 87fc97d1311bab9a7cecf650f014bfb4172fbf1e Mon Sep 17 00:00:00 2001 From: Matt Lundin Date: Fri, 28 Oct 2011 17:57:42 +0000 Subject: [PATCH 2/2] Fix holidays symbol in org-class * lisp/org-agenda.el: (org-class): Fix holidays symbol in org-class. This was resulting in an "Bad sexp..." warning. --- lisp/org-agenda.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 66686f920..cbf840721 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -4907,7 +4907,7 @@ holidy will also be skipped." (progn (require 'cal-iso) (not (member (car (calendar-iso-from-absolute d)) skip-weeks)))) - (not (and (memq `holidays' skip-weeks) + (not (and (memq 'holidays skip-weeks) (calendar-check-holidays date))) entry)))