Changeset 4079 for trunk/lisp/textmodes/org.el

Timestamp:

05/13/06 11:31:18 (3 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/textmodes/org.el (modified) (3 diffs)

trunk/lisp/textmodes/org.el

@@ -4349 +4349 @@
-             ct))
-         (calendar-move-hook nil)
+         (view-calendar-holidays-initially nil)
-         (view-diary-entries-initially nil)
-         (timestr (format-time-string
@@ -4725 +4726 @@
-  (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)
@@ -6911 +6913 @@
-         (date (calendar-gregorian-from-absolute day))
-         (calendar-move-hook nil)
+         (view-calendar-holidays-initially nil)
-         (view-diary-entries-initially nil))
-    (calendar)