Mercurial > emacs
diff lisp/textmodes/org.el @ 90399:a5812696f7bf unicode-pre-font-backend
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 274-284)
- Update from CVS
- Update etc/MORE.STUFF.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 101)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 17 May 2006 07:46:49 +0000 |
| parents | 2ecafc6d5db7 af0fd91baddc |
| children | a8190f7e546e |
line wrap: on
line diff
--- a/lisp/textmodes/org.el Mon May 15 03:48:50 2006 +0000 +++ b/lisp/textmodes/org.el Wed May 17 07:46:49 2006 +0000 @@ -4348,6 +4348,7 @@ (parse-time-string (match-string 1)))) ct)) (calendar-move-hook nil) + (view-calendar-holidays-initially nil) (view-diary-entries-initially nil) (timestr (format-time-string (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") default-time)) @@ -4724,6 +4725,7 @@ (interactive "P") (let ((tsr org-ts-regexp) diff (calendar-move-hook nil) + (view-calendar-holidays-initially nil) (view-diary-entries-initially nil)) (if (or (org-at-timestamp-p) (save-excursion @@ -6910,6 +6912,7 @@ (error "Don't know which date to open in calendar"))) (date (calendar-gregorian-from-absolute day)) (calendar-move-hook nil) + (view-calendar-holidays-initially nil) (view-diary-entries-initially nil)) (calendar) (calendar-goto-date date)))