Mercurial > emacs
comparison lisp/org/org-agenda.el @ 99849:621e15919df0
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-dblock-write:clocktable): Make sure the
clocktable sees the first line.
(org-clock-in): Warn if the clock cannot be resumed.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-open-at-point): Fix mixup about interactive and
non-interactive elisp links.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-preprocess-string): Allow one comment
line before the first headline to always be included. This is
to not miss a commented target.
* org-mouse.el (org-mouse-insert-item): Call
`org-indent-to-column' instead of `indent-to', for XEmacs
compatibility.
* org.el (org-refile-targets): Fix customize definition so
that it works also in XEmacs.
(org-fixup-indentation): Call `org-indent-to-column' instead
of `indent-to', for XEmacs compatibility.
2008-11-23 Tokuya Kameshima <kames@fa2.so-net.ne.jp>
* org-mew.el (org-mew-store-link): Get the correct case folder
for refiled messages.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-export-as-ascii): Remove the "\\" forced
line break indicators.
* org.el (org-ido-completing-read): Remove the "i:" prefix for
ido-completion propts.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-apply-template): Use
`org-substring-no-properties'.
* org-compat.el (org-substring-no-properties): New function.
* org-remember.el (org-remember-apply-template): Use
`org-substring-no-properties' for compatibility.
* org-list.el (org-list-two-spaces-after-bullet-regexp): New
option.
(org-fix-bullet-type): respect
`org-list-two-spaces-after-bullet-regexp'.
* org-clock.el (org-clock-load): Clean up the code.
* org.el (org-adaptive-fill-function): Allow two spaces after
"1." as a list bullet.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-save, org-clock-load): Check for
live buffers, existing files, and buffer file names to ensure
consistent information.
(org-clock-persist): Make `clock' a special value of this
variable, and improve docstring.
* org-list.el (org-cycle-list-bullet, org-fix-bullet-type)
(org-get-string-indentation): Adapt indentation when the bullet
width changes.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-finalize): Make interactive.
(org-remember-kill): New command.
(org-remember-finish-immediately): Call `org-remember-finalize'
directly.
(org-remember-finalize): Make `org-remember-finalize' an interactive
function.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-remember.el (org-remember-apply-template): No ido completion
for free prompts in remember templates.
(org-remember-before-finalize-hook): New hook.
(org-remember-mode): New minor mode.
(org-remember-apply-template): Turn on `org-remember-mode'.
* org-id.el (org-id-add-location): Avoid error when no file is
given.
* org-remember.el (org-remember-apply-template): Fix the way how
the list of allowed properties is retrieved from the target file.
* org.el (org-insert-link): Improve file link matching.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-colview.el (org-columns-display-here): New argument
DATELINE, to trigger using the new face.
(org-agenda-colview-summarize): Call `org-columns-display-here'
with the new argument.
* org-faces.el (org-agenda-column-dateline): New face.
* org-publish.el (org-publish-org-index): Use index-title at page
title, not as section.
* org-exp.el (org-export-html-format-desc): Respect the
org-protect property.
(org-export-as-html): Protect image specifiers that are in the
description part of a link.
* org.el (org-sort-entries-or-items, org-completing-read)
(org-refile-get-location, org-olpath-completing-read, org-todo)
(org-show-todo-tree, org-sparse-tree, org-make-tags-matcher)
(org-set-tags, org-change-tag-in-region, org-fast-tag-selection)
(org-set-property, org-delete-property)
(org-delete-property-globally): Use `org-ido-completing-read'.
* org-remember.el (org-remember-apply-template): Use
`org-ido-completing-read'.
* org-publish.el (org-publish): Use `org-ido-completing-read'.
* org-colview.el (org-columns-edit-value, org-columns-new)
(org-insert-columns-dblock): Use `org-ido-completing-read'.
* org-colview-xemacs.el (org-columns-edit-value)
(org-columns-new, org-insert-columns-dblock): Use
`org-ido-completing-read'.
* org-attach.el (org-attach-delete-one, org-attach-open): Use
`org-ido-completing-read'.
* org-agenda.el (org-todo-list, org-agenda-filter-by-tag): Use
`org-ido-completing-read'.
* org.el (org-time-today): New function.
(org-matcher-time): Use `org-time-today'. Add special treatment
for "<tomorrow>" and "<yesterday>".
(org-ido-completing-read): New function.
(org-completion-use-ido): New option.
* org-exp.el (org-export-format-source-code): Fix bug in require
htmlize code.
(org-export-target-internal-links): Fix bug in search for text
property.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-export-latex.el (org-export-latex-subcontent): Interprete
target aliases as additonal labels.
* org-exp.el (org-export-target-aliases): New variable.
(org-export-preprocess-string)
(org-export-handle-invisible-targets): Fill the alias alist.
(org-export-as-html): Remove the from the anchor, and also
assign an id.
(org-html-level-start): Insert the target aliases as additonal
anchors.
* org.el (org-edit-fixed-width-region): Fix bug when starting a new
picture area.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-open-at-mouse): Ensure correct link abbreviations
when following a link with the mouse from the agenda.
* org-exp.el (org-export-as-html): Avoid lone </div> when no
headlines are created.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-link-translation-function): New option.
(org-open-at-point): Call `org-link-translation-function' if
non-nil.
(org-translate-link): New function.
(org-translate-link-from-planner): New function.
(org-open-at-point): Allow interactive commands in elisp links.
* org-exp.el (org-icalendar-cleanup-string): Restore the old
iCalendar quoting. The new one seems to caus problems with
applications.
* org.el (org-yank): Set `this-command' to `yank', so that
`yank-pop' will work.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-exp.el (org-icalendar-cleanup-string): Improve RFC2455
compliance as far as quoting is concerned.
* org.el (org-link-expand-abbrev): Implement %h as an escape for a
hexified version of the tag.
* org-vm.el (org-vm-follow-link): Require `vm-search'.
* org.el (org-up-heading-safe, org-forward-same-level): Always
call `org-back-to-heading' instead of `outline-back-to-heading'.
(org-back-to-heading): New wrapper around outline-back-to-heading,
with a useful error message telling where the error happened.
* org-list.el (org-update-checkbox-count): Always call
`org-back-to-heading' instead of `outline-back-to-heading'.
* org-exp.el (org-export-as-html): Make sure that each <img> tag
has an `alt' attribute, to ensure XHTML validation.
2008-11-23 Carsten Dominik <carsten.dominik@gmail.com>
* org-publish.el (org-publish-attachment): Allow publishing to
overwrite attachment files.
* org-agenda.el (org-agenda-timerange-leaders): New option.
(org-agenda-get-blocks): Use `org-agenda-timerange-leaders'.
* org.el (org-edit-src-exit): Untabify ASCII image before
returning.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sun, 23 Nov 2008 13:37:44 +0000 |
parents | 4f4cd5ec5030 |
children | 57447f70a253 |
comparison
equal
deleted
inserted
replaced
99848:80e53e313ff5 | 99849:621e15919df0 |
---|---|
4 ;; Free Software Foundation, Inc. | 4 ;; Free Software Foundation, Inc. |
5 | 5 |
6 ;; Author: Carsten Dominik <carsten at orgmode dot org> | 6 ;; Author: Carsten Dominik <carsten at orgmode dot org> |
7 ;; Keywords: outlines, hypermedia, calendar, wp | 7 ;; Keywords: outlines, hypermedia, calendar, wp |
8 ;; Homepage: http://orgmode.org | 8 ;; Homepage: http://orgmode.org |
9 ;; Version: 6.12a | 9 ;; Version: 6.13 |
10 ;; | 10 ;; |
11 ;; This file is part of GNU Emacs. | 11 ;; This file is part of GNU Emacs. |
12 ;; | 12 ;; |
13 ;; GNU Emacs is free software: you can redistribute it and/or modify | 13 ;; GNU Emacs is free software: you can redistribute it and/or modify |
14 ;; it under the terms of the GNU General Public License as published by | 14 ;; it under the terms of the GNU General Public License as published by |
875 "Format for the TODO keyword in agenda lines. | 875 "Format for the TODO keyword in agenda lines. |
876 Set this to something like \"%-12s\" if you want all TODO keywords | 876 Set this to something like \"%-12s\" if you want all TODO keywords |
877 to occupy a fixed space in the agenda display." | 877 to occupy a fixed space in the agenda display." |
878 :group 'org-agenda-line-format | 878 :group 'org-agenda-line-format |
879 :type 'string) | 879 :type 'string) |
880 | |
881 (defcustom org-agenda-timerange-leaders '("" "(%d/%d): ") | |
882 "Text preceding timerange entries in the agenda view. | |
883 This is a list with two strings. The first applies when the range | |
884 is entirely on one day. The second applies if the range spans several days. | |
885 The strings may have two \"%d\" format specifiers which will be filled | |
886 with the sequence number of the days, and the total number of days in the | |
887 range, respectively." | |
888 :group 'org-agenda-line-format | |
889 :type '(list | |
890 (string :tag "Deadline today ") | |
891 (choice :tag "Deadline relative" | |
892 (string :tag "Format string") | |
893 (function)))) | |
880 | 894 |
881 (defcustom org-agenda-scheduled-leaders '("Scheduled: " "Sched.%2dx: ") | 895 (defcustom org-agenda-scheduled-leaders '("Scheduled: " "Sched.%2dx: ") |
882 "Text preceeding scheduled items in the agenda view. | 896 "Text preceeding scheduled items in the agenda view. |
883 This is a list with two strings. The first applies when the item is | 897 This is a list with two strings. The first applies when the item is |
884 scheduled on the current day. The second applies when it has been scheduled | 898 scheduled on the current day. The second applies when it has been scheduled |
2720 (and arg (integerp arg) (> arg 0) | 2734 (and arg (integerp arg) (> arg 0) |
2721 (nth (1- arg) kwds)))) | 2735 (nth (1- arg) kwds)))) |
2722 rtn rtnall files file pos) | 2736 rtn rtnall files file pos) |
2723 (when (equal arg '(4)) | 2737 (when (equal arg '(4)) |
2724 (setq org-select-this-todo-keyword | 2738 (setq org-select-this-todo-keyword |
2725 (completing-read "Keyword (or KWD1|K2D2|...): " | 2739 (org-ido-completing-read "Keyword (or KWD1|K2D2|...): " |
2726 (mapcar 'list kwds) nil nil))) | 2740 (mapcar 'list kwds) nil nil))) |
2727 (and (equal 0 arg) (setq org-select-this-todo-keyword nil)) | 2741 (and (equal 0 arg) (setq org-select-this-todo-keyword nil)) |
2728 (org-set-local 'org-last-arg arg) | 2742 (org-set-local 'org-last-arg arg) |
2729 (setq org-agenda-redo-command | 2743 (setq org-agenda-redo-command |
2730 '(org-todo-list (or current-prefix-arg org-last-arg))) | 2744 '(org-todo-list (or current-prefix-arg org-last-arg))) |
3382 'org-category category 'date date | 3396 'org-category category 'date date |
3383 'type "sexp") | 3397 'type "sexp") |
3384 (push txt ee)))) | 3398 (push txt ee)))) |
3385 (nreverse ee))) | 3399 (nreverse ee))) |
3386 | 3400 |
3387 (defalias 'org-get-closed 'org-agenda-get-progress) | 3401 (defalias 'org-get-closed 'org-get-progress) |
3388 (defun org-agenda-get-progress () | 3402 (defun org-agenda-get-progress () |
3389 "Return the logged TODO entries for agenda display." | 3403 "Return the logged TODO entries for agenda display." |
3390 (let* ((props (list 'mouse-face 'highlight | 3404 (let* ((props (list 'mouse-face 'highlight |
3391 'org-not-done-regexp org-not-done-regexp | 3405 'org-not-done-regexp org-not-done-regexp |
3392 'org-todo-regexp org-todo-regexp | 3406 'org-todo-regexp org-todo-regexp |
3396 (format "mouse-2 or RET jump to org file %s" | 3410 (format "mouse-2 or RET jump to org file %s" |
3397 (abbreviate-file-name buffer-file-name)))) | 3411 (abbreviate-file-name buffer-file-name)))) |
3398 (items (if (consp org-agenda-show-log) | 3412 (items (if (consp org-agenda-show-log) |
3399 org-agenda-show-log | 3413 org-agenda-show-log |
3400 org-agenda-log-mode-items)) | 3414 org-agenda-log-mode-items)) |
3401 (parts | 3415 (parts |
3402 (delq nil | 3416 (delq nil |
3403 (list | 3417 (list |
3404 (if (memq 'closed items) (concat "\\<" org-closed-string)) | 3418 (if (memq 'closed items) (concat "\\<" org-closed-string)) |
3405 (if (memq 'clock items) (concat "\\<" org-clock-string)) | 3419 (if (memq 'clock items) (concat "\\<" org-clock-string)) |
3406 (if (memq 'state items) "- State \"\\([a-zA-Z0-9]+\\)\"")))) | 3420 (if (memq 'state items) "- State \"\\([a-zA-Z0-9]+\\)\"")))) |
3675 (setq head (match-string 1)) | 3689 (setq head (match-string 1)) |
3676 (and org-agenda-skip-timestamp-if-done | 3690 (and org-agenda-skip-timestamp-if-done |
3677 (org-entry-is-done-p) | 3691 (org-entry-is-done-p) |
3678 (throw :skip t)) | 3692 (throw :skip t)) |
3679 (setq txt (org-format-agenda-item | 3693 (setq txt (org-format-agenda-item |
3680 (format (if (= d1 d2) "" "(%d/%d): ") | 3694 (format |
3681 (1+ (- d0 d1)) (1+ (- d2 d1))) | 3695 (nth (if (= d1 d2) 0 1) |
3696 org-agenda-timerange-leaders) | |
3697 (1+ (- d0 d1)) (1+ (- d2 d1))) | |
3682 head category tags | 3698 head category tags |
3683 (if (= d0 d1) timestr)))) | 3699 (if (= d0 d1) timestr)))) |
3684 (setq txt org-agenda-no-heading-message)) | 3700 (setq txt org-agenda-no-heading-message)) |
3685 (org-add-props txt props | 3701 (org-add-props txt props |
3686 'org-marker marker 'org-hd-marker hdmarker | 3702 'org-marker marker 'org-hd-marker hdmarker |
4253 (when (equal char ?\t) | 4269 (when (equal char ?\t) |
4254 (unless (local-variable-p 'org-global-tags-completion-table (current-buffer)) | 4270 (unless (local-variable-p 'org-global-tags-completion-table (current-buffer)) |
4255 (org-set-local 'org-global-tags-completion-table | 4271 (org-set-local 'org-global-tags-completion-table |
4256 (org-global-tags-completion-table))) | 4272 (org-global-tags-completion-table))) |
4257 (let ((completion-ignore-case t)) | 4273 (let ((completion-ignore-case t)) |
4258 (setq tag (completing-read | 4274 (setq tag (org-ido-completing-read |
4259 "Tag: " org-global-tags-completion-table)))) | 4275 "Tag: " org-global-tags-completion-table)))) |
4260 (cond | 4276 (cond |
4261 ((equal char ?/) (org-agenda-filter-by-tag-show-all)) | 4277 ((equal char ?/) (org-agenda-filter-by-tag-show-all)) |
4262 ((or (equal char ?\ ) | 4278 ((or (equal char ?\ ) |
4263 (setq a (rassoc char alist)) | 4279 (setq a (rassoc char alist)) |