Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
90398:1f8d5cd37cf0 | 90399:a5812696f7bf |
---|---|
4346 'encode-time | 4346 'encode-time |
4347 (mapcar (lambda(x) (or x 0)) | 4347 (mapcar (lambda(x) (or x 0)) |
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)) |
4354 (prompt (format "YYYY-MM-DD [%s]: " timestr)) | 4355 (prompt (format "YYYY-MM-DD [%s]: " timestr)) |
4355 ans ans1 ans2 | 4356 ans ans1 ans2 |
4722 If there is a time stamp in the current line, go to that date. | 4723 If there is a time stamp in the current line, go to that date. |
4723 A prefix ARG can be used to force the current date." | 4724 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 |
4730 (beginning-of-line 1) | 4732 (beginning-of-line 1) |
4731 (looking-at (concat ".*" tsr)))) | 4733 (looking-at (concat ".*" tsr)))) |
6908 (org-agenda-check-type t 'agenda 'timeline) | 6910 (org-agenda-check-type t 'agenda 'timeline) |
6909 (let* ((day (or (get-text-property (point) 'day) | 6911 (let* ((day (or (get-text-property (point) 'day) |
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))) |
6916 | 6919 |
6917 (defun org-calendar-goto-agenda () | 6920 (defun org-calendar-goto-agenda () |