summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2011-10-28 15:17:06 +0200
committerBastien Guerry <bzg@altern.org>2011-10-28 15:17:06 +0200
commit30f7c5cc0d2079b03227abfde58539fc6246c149 (patch)
treef78aa8613bfb31fd609522071ca24cdc8ede3aae
parent735bf5cd05c970d08aaecf800973f59a39dea7fb (diff)
parent87fc97d1311bab9a7cecf650f014bfb4172fbf1e (diff)
downloadorg-mode-30f7c5cc0d2079b03227abfde58539fc6246c149.tar.gz
Merge branch 'master' of orgmode.org:org-mode
-rw-r--r--lisp/org-agenda.el2
-rw-r--r--lisp/org.el1
2 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 66686f9..cbf8407 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)))
diff --git a/lisp/org.el b/lisp/org.el
index 2599d41..b55de90 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