aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarsten Dominik2006-05-11 08:49:36 +0000
committerCarsten Dominik2006-05-11 08:49:36 +0000
commitf6e25a10e3a96fd46194027dcf43e9a8900317f3 (patch)
tree06170727920b36051beb99f98ef60cc1440307c0
parente3eea8436d864519022dd5825ac079e5ec89af95 (diff)
downloademacs-f6e25a10e3a96fd46194027dcf43e9a8900317f3.tar.gz
emacs-f6e25a10e3a96fd46194027dcf43e9a8900317f3.zip
(org-read-date, org-goto-calendar, org-agenda-goto-calendar): Bind
`view-calendar-holidays-initially' to nil.
-rw-r--r--lisp/textmodes/org.el3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 3c18eda2305..ea9aa4448ee 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -4348,6 +4348,7 @@ used to insert the time stamp into the buffer to include the time."
4348 (parse-time-string (match-string 1)))) 4348 (parse-time-string (match-string 1))))
4349 ct)) 4349 ct))
4350 (calendar-move-hook nil) 4350 (calendar-move-hook nil)
4351 (view-calendar-holidays-initially nil)
4351 (view-diary-entries-initially nil) 4352 (view-diary-entries-initially nil)
4352 (timestr (format-time-string 4353 (timestr (format-time-string
4353 (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") default-time)) 4354 (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") default-time))
@@ -4724,6 +4725,7 @@ A prefix ARG can be used to force the current date."
4724 (interactive "P") 4725 (interactive "P")
4725 (let ((tsr org-ts-regexp) diff 4726 (let ((tsr org-ts-regexp) diff
4726 (calendar-move-hook nil) 4727 (calendar-move-hook nil)
4728 (view-calendar-holidays-initially nil)
4727 (view-diary-entries-initially nil)) 4729 (view-diary-entries-initially nil))
4728 (if (or (org-at-timestamp-p) 4730 (if (or (org-at-timestamp-p)
4729 (save-excursion 4731 (save-excursion
@@ -6910,6 +6912,7 @@ argument, latitude and longitude will be prompted for."
6910 (error "Don't know which date to open in calendar"))) 6912 (error "Don't know which date to open in calendar")))
6911 (date (calendar-gregorian-from-absolute day)) 6913 (date (calendar-gregorian-from-absolute day))
6912 (calendar-move-hook nil) 6914 (calendar-move-hook nil)
6915 (view-calendar-holidays-initially nil)
6913 (view-diary-entries-initially nil)) 6916 (view-diary-entries-initially nil))
6914 (calendar) 6917 (calendar)
6915 (calendar-goto-date date))) 6918 (calendar-goto-date date)))