Mercurial > emacs

comparison lisp/org/org.el @ 109418:6e96aca307a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from mainline.
author Katsumi Yamaoka <yamaoka@jpl.org>
date Sun, 27 Jun 2010 22:48:36 +0000
parents 446dbaf86e72
children a150e8a14679
comparison
equal deleted inserted replaced
109417:338717febe80 109418:6e96aca307a4
70 70
71 ;;;; Require other packages 71 ;;;; Require other packages
72 72
73 (eval-when-compile 73 (eval-when-compile
74 (require 'cl) 74 (require 'cl)
75 (require 'gnus-sum) 75 (require 'gnus-sum))
76 (require 'calendar)) 76
77 (require 'calendar)
78 ;; Emacs 22 calendar compatibility: Make sure the new variables are available
79 (unless (boundp 'calendar-view-holidays-initially-flag)
80 (defvaralias 'calendar-view-holidays-initially-flag
81 'view-calendar-holidays-initially))
82 (unless (boundp 'calendar-view-diary-initially-flag)
83 (defvaralias 'calendar-view-diary-initially-flag
84 'view-diary-entries-initially))
85 (unless (boundp 'diary-fancy-buffer)
86 (defvaralias 'diary-fancy-buffer 'fancy-diary-buffer))
87
77 ;; For XEmacs, noutline is not yet provided by outline.el, so arrange for 88 ;; For XEmacs, noutline is not yet provided by outline.el, so arrange for
78 ;; the file noutline.el being loaded. 89 ;; the file noutline.el being loaded.
79 (if (featurep 'xemacs) (condition-case nil (require 'noutline))) 90 (if (featurep 'xemacs) (condition-case nil (require 'noutline)))
80 ;; We require noutline, which might be provided in outline.el 91 ;; We require noutline, which might be provided in outline.el
81 (require 'outline) (require 'noutline) 92 (require 'outline) (require 'noutline)
13514 (setq def (apply 'encode-time defdecode) 13525 (setq def (apply 'encode-time defdecode)
13515 defdecode (decode-time def))))) 13526 defdecode (decode-time def)))))
13516 (calendar-frame-setup nil) 13527 (calendar-frame-setup nil)
13517 (calendar-move-hook nil) 13528 (calendar-move-hook nil)
13518 (calendar-view-diary-initially-flag nil) 13529 (calendar-view-diary-initially-flag nil)
13519 (view-diary-entries-initially nil)
13520 (calendar-view-holidays-initially-flag nil) 13530 (calendar-view-holidays-initially-flag nil)
13521 (view-calendar-holidays-initially nil)
13522 (timestr (format-time-string 13531 (timestr (format-time-string
13523 (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") def)) 13532 (if with-time "%Y-%m-%d %H:%M" "%Y-%m-%d") def))
13524 (prompt (concat (if prompt (concat prompt " ") "") 13533 (prompt (concat (if prompt (concat prompt " ") "")
13525 (format "Date+time [%s]: " timestr))) 13534 (format "Date+time [%s]: " timestr)))
13526 ans (org-ans0 "") org-ans1 org-ans2 final) 13535 ans (org-ans0 "") org-ans1 org-ans2 final)
14576 A prefix ARG can be used to force the current date." 14585 A prefix ARG can be used to force the current date."
14577 (interactive "P") 14586 (interactive "P")
14578 (let ((tsr org-ts-regexp) diff 14587 (let ((tsr org-ts-regexp) diff
14579 (calendar-move-hook nil) 14588 (calendar-move-hook nil)
14580 (calendar-view-holidays-initially-flag nil) 14589 (calendar-view-holidays-initially-flag nil)
14581 (view-calendar-holidays-initially nil) 14590 (calendar-view-diary-initially-flag nil))
14582 (calendar-view-diary-initially-flag nil)
14583 (view-diary-entries-initially nil))
14584 (if (or (org-at-timestamp-p) 14591 (if (or (org-at-timestamp-p)
14585 (save-excursion 14592 (save-excursion
14586 (beginning-of-line 1) 14593 (beginning-of-line 1)
14587 (looking-at (concat ".*" tsr)))) 14594 (looking-at (concat ".*" tsr))))
14588 (let ((d1 (time-to-days (current-time))) 14595 (let ((d1 (time-to-days (current-time)))