mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-25 07:27:57 +00:00
Code

Merge branch 'master' of orgmode.org:org-mode

Browse Source
This commit is contained in:
Bastien Guerry 2011-10-28 15:17:06 +02:00
commit 30f7c5cc0d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lisp/org-agenda.el
View File

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

1
lisp/org.el
View File

@ -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