Mercurial > emacs
comparison lisp/org/org-macs.el @ 94414:d86cb59eea9f
2008-04-27 Carsten Dominik <dominik@science.uva.nl>
* org/org.el (org-html-level-start): Always have id's in HTML
(org-export-as-html): Use `org-link-protocols' to
retrieve the export form of the link.
(org-add-link-type): Final parameter renamed from PUBLISH. Better
documentation of how it is to be used. Avoid double entries for
the same link type.
(org-add-link-props): New function.
(org-modules-loaded): New variable.
(org-load-modules-maybe, org-set-modules): New function.
(org-modules): New option.
(org-mode, org-cycle, orgstruct-mode, org-run-like-in-org-mode)
(orgtbl-mode, org-store-link, org-insert-link-global)
(org-open-at-point): Call `org-load-modules-maybe'.
(org-search-view): Add more text properties.
(org-agenda-schedule, org-agenda-deadline): Allow also in
search-type agendas.
(org-search-view): Order of arguments has been changed.
Interpret prefix-arg as TODO-ONLY.
(org-agenda, org-run-agenda-series, org-agenda-manipulate-query):
Take new argument order of `org-search-view' into account.
(org-todo-only): New variable.
(org-search-syntax-table): New variable and function.
(org-search-view): Do the search with the special syntax table.
(define-obsolete-function-alias): Make work with XEmacs.
(org-add-planning-info): Use old date as default when modifying an
existing deadline or scheduled item.
(org-agenda-compute-time-span): Make argument N optional.
(org-agenda-format-date-aligned): Require `cal-iso'.
(org-agenda-list): Include week into into agenda heading, don't
list it at each date (only on Mondays).
(org-read-date-analyze): Define local variable `iso-date'.
(org-agenda-format-date-aligned): Remove dependency on
`calendar-time-from-absolute'.
(org-remember-apply-template, org-go-to-remember-target):
Interpret filenames relative to `org-directory'.
(org-complete): Silently fail when trying to complete
keywords that don't have a default value.
(org-get-current-options): Added a #+DATE: option.
(org-additional-option-like-keywords): Removed "DATE:" from the
list of additional keywords.
(org-export-as-html): Removed (current-time) as unnecessary second
argument of `format-time-string'.
(org-clock-find-position): Handle special case at end of
buffer.
(org-agenda-day-view): New argument DAY-OF-YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-week-view): New argument ISO-WEEK, pass it on to
`org-agenda-change-time-span'.
(org-agenda-month-view): New argument MONTH, pass it on to
`org-agenda-change-time-span'.
(org-agenda-year-view): New argument YEAR, pass it on to
`org-agenda-change-time-span'.
(org-agenda-change-time-span): New optional argument N, pass it on
to `org-agenda-compute-time-span'.
(org-agenda-compute-time-span): New argument N, interpret it by
changing the starting day.
(org-small-year-to-year): New function.
(org-scheduled-past-days): Respect
`org-scheduled-past-days'.
(org-auto-repeat-maybe): Make sure that repeating
dates are pushed into the future, and that the shift is at least
one interval, never 0.
(org-update-checkbox-count): Fix bug with checkbox
counting.
(org-add-note): New command.
(org-add-log-setup): Renamed from `org-add-log-maybe'.
(org-log-note-headings): New entry for plain notes (i.e. notes not
related to state changes or clocking).
(org-get-org-file): Check for availability of
`remember-data-file'.
(org-cached-entry-get): Allow a regexp value for
`org-use-property-inheritance'.
(org-use-property-inheritance): Allow regexp value. Fix bug in
customization type.
(org-use-tag-inheritance): Allow a list and a regexp value for
this variable.
(org-scan-tags, org-get-tags-at): Implement selective tag
inheritance.
(org-entry-get): Respect value `selective' for the INHERIT
argument.
(org-tag-inherit-p, org-property-inherit-p): New functions.
(org-agenda-format-date-aligned): Allow 10 characters for
weekday, to acomodate German locale.
(org-add-archive-files): New function.
(org-agenda-files): New argument `ext', to
get archive files as well.
(org-tbl-menu): Protect the use of variables that
are only available when org-table.el gets loaded.
(org-read-agenda-file-list): Error if `org-agenda-files' is a
single directory.
(org-open-file): Allow a batch process to trigger
waiting after executing a system command.
(org-store-link): Link to headline when there is not
target and no region in an org-mode buffer when creating a link.
(org-link-types-re): New variable.
(org-make-link-regexps): Compute `org-link-types-re'.
(org-make-link-description-function): New option.
(org-agenda-date, org-agenda-date-weekend): New faces.
(org-archive-sibling-heading): New option.
(org-archive-to-archive-sibling): New function.
(org-iswitchb): New command.
(org-buffer-list): New function.
(org-agenda-columns): Also try the #+COLUMNS line in
the buffer associated with the entry at point (or with the first
entry in the agenda view).
(org-modules): Add entry for org-bibtex.el.
(org-completion-fallback-command): Moved into `org-completion'
group.
(org-clock-heading-function): Moved to `org-progress' group.
(org-auto-repeat-maybe): Make sure that a note can
be enforces if `org-log-repeat' is `note'.
(org-modules): Allow additional symbols for external
packages.
(org-ctrl-c-ctrl-c): Allow for `org-clock-overlays' to be
undefined.
(org-clock-goto): Hide drawers after showing an
entry with `org-clock-goto.'
(org-shiftup, org-shiftdown, org-shiftright, org-shiftleft): Try
also a clocktable block shift.
(org-clocktable-try-shift): New function.
(org-columns-hscoll-title): New function.
(org-columns-previous-hscroll): New variable.
(org-columns-full-header-line-format): New variable.
(org-columns-display-here-title, org-columns-remove-overlays):
Install `org-columns-hscoll-title' in post-command-hook.
* org/org.el: Split into many small files.
* org/org-agenda.el: New file, split off from org.el.
* org/org-archive.el: New file, split off from org.el.
* org/org-bbdb.el: New file.
* org/org-bibtex.el: New file, split off from org.el.
* org/org-clock.el: New file, split off from org.el.
* org/org-colview.el: New file, split off from org.el.
* org/org-compat.el: New file, split off from org.el.
* org/org-exp.el: New file, split off from org.el.
* org/org-faces.el: New file, split off from org.el.
* org/org-gnus.el: New file, split off from org.el.
* org/org-info.el: New file, split off from org.el.
* org/org-infojs.el: New file.
* org/org-irc.el: New file.
* org/org-macs.el: New file, split off from org.el.
* org/org-mew.el: New file.
* org/org-mhe.el: New file, split off from org.el.
* org/org-publish.el: New file, split off from org.el.
* org/org-remember.el: New file, split off from org.el.
* org/org-rmail.el: New file, split off from org.el.
* org/org-table.el: New file, split off from org.el.
* org/org-vm.el: New file, split off from org.el.
* org/org-wl.el: New file, split off from org.el.
2008-04-27 Jason Riedy <jason@acm.org>
* lisp/org-table.el (orgtbl-to-generic): Add a :remove-nil-lines
parameter that supresses lines that evaluate to NIL.
(orgtbl-get-fmt): New inline function for
picking apart formats that may be lists.
(orgtbl-apply-fmt): New inline function for applying formats that
may be functions.
(orgtbl-eval-str): New inline function for strings that may be
functions.
(orgtbl-format-line, orgtbl-to-generic): Use and document.
(orgtbl-to-latex, orgtbl-to-texinfo): Document.
(*orgtbl-llfmt*, *orgtbl-llstart*)
(*orgtbl-llend*): Dynamic variables for last-line formatting.
(orgtbl-format-section): Shift formatting to support detecting the
last line and formatting it specially.
(orgtbl-to-generic): Document :ll* formats. Set to the non-ll
formats unless overridden.
(orgtbl-to-latex): Suggest using :llend to suppress the final \\.
(*orgtbl-table*, *orgtbl-rtn*): Dynamically
bound variables to hold the input collection of lines and output
formatted text.
(*orgtbl-hline*, *orgtbl-sep*, *orgtbl-fmt*, *orgtbl-efmt*,
(*orgtbl-lfmt*, *orgtbl-lstart*, *orgtbl-lend*): Dynamically bound
format parameters.
(orgtbl-format-line): New function encapsulating formatting for a
single line.
(orgtbl-format-section): Similar for each section. Rebinding the
dynamic vars customizes the formatting for each section.
(orgtbl-to-generic): Use orgtbl-format-line and
orgtbl-format-section.
(org-get-param): Now unused, so delete.
(orgtbl-gather-send-defs): New function to
gather all the SEND definitions before a table.
(orgtbl-send-replace-tbl): New function to find the RECEIVE
corresponding to the current name.
(orgtbl-send-table): Use the previous two functions and implement
multiple destinations for each table.
* doc/org.texi (A LaTeX example): Note that fmt may be a
one-argument function, and efmt may be a two-argument function.
(Radio tables): Document multiple destinations.
2008-04-27 Carsten Dominik <dominik@science.uva.nl>
* org/org-agenda.el (org-add-to-diary-list): New function.
(org-prefix-has-effort): New variable.
(org-sort-agenda-noeffort-is-high): New option.
(org-agenda-columns-show-summaries)
(org-agenda-columns-compute-summary-properties): New options.
(org-format-agenda-item): Compute the duration of the item.
(org-agenda-weekend-days): New variable.
(org-agenda-list, org-timeline): Use the proper faces for dates in
the agenda and timeline buffers.
(org-agenda-archive-to-archive-sibling): New command.
(org-agenda-start-with-clockreport-mode): New option.
(org-agenda-clockreport-parameter-plist): New option.
(org-agenda-clocktable-mode): New variable.
(org-agenda-deadline-leaders): Allow a function value for the
deadline leader.
(org-agenda-get-deadlines): Deal with new function value.
* lisp/org-clock.el (org-clock): New customization group.
(org-clock-into-drawer, org-clock-out-when-done)
(org-clock-in-switch-to-state, org-clock-heading-function): Moved
into the new group.
(org-clock-out-remove-zero-time-clocks): New option.
(org-clock-out): Use `org-clock-out-remove-zero-time-clocks'.
(org-dblock-write:clocktable): Allow a Lisp form for the scope
parameter.
(org-dblock-write:clocktable): Fixed bug with total time
calculation.
(org-dblock-write:clocktable): Request the unrestricted list of
files.
(org-get-clocktable): New function.
(org-dblock-write:clocktable): Make sure :tstart and :tend can not
only be strings but also integers (an absolute day number) and
lists (m d y).
* org/org-colview.el (org-columns-next-allowed-value)
(org-columns-edit-value): Limit the effort for updatig in the
agenda to recomputing a single file.
(org-columns-compute): Only write property value if it has
changed. This avoids raising the buffer-change-flag
unnecessarily.
(org-agenda-colview-summarize)
(org-agenda-colview-compute): New functions.
(org-agenda-columns): Call `org-agenda-colview-summarize'.
* org/org-exp.el (org-export-run-in-background): New option.
(org-export-icalendar): Allow a batch process to trigger waiting
after executing a system command.
(org-export-preprocess-string): Renamed-from
`org-cleaned-string-for-export'.
(org-export-html-style): Made target class look like normal text.
(org-export-as-html): Make use of the better proprocessing in
`org-cleaned-string-for-export'.
(org-cleaned-string-for-export): Better treatment of heuristic
targets, many more internal links will now work in HTML export.
(org-get-current-options): Incorporate LINK_UP, LINK_HOME, and
INFOJS.
(org-export-inbuffer-options-extra): New variable.
(org-export-options-filters): New hook.
(org-infile-export-plist): Find also the settings keywords in
`org-export-inbuffer-options-extra'.
(org-infile-export-plist): Allow multiple #+OPTIONS lines and
multiple #+INFOJS_OPT lines.
(org-export-html-handle-js-options): New function.
(org-export-html-infojs-setup): New option.
(org-export-as-html): Call `org-export-html-handle-js-options'.
Add autoload to all entry points.
(org-skip-comments): Function removed.
* org/org-table.el (org-table-make-reference): Extra parenthesis
around single fields, to make sure that algebraic formulas get
correctly interpreted by calc.
(org-table-current-column): No longer interactive.
* org/org-export-latex.el (org-export-latex-preprocess): Renamed
from `org-export-latex-cleaned-string'.
2008-04-27 Bastien Guerry <bzg@altern.org>
* org/org-publish.el (org-publish-get-base-files-1): New function.
(org-publish-get-base-files): Use it.
(org-publish-temp-files): New variable.
Don't require 'dired-aux anymore.
(org-publish-initial-buffer): New variable.
(org-publish-org-to, org-publish): Use it.
(org-publish-get-base-files-1): Bug fix: get
the proper list of files when recursing thru a directory.
(org-publish-get-base-files): Use the :exclude property to skip
both files and directories.
author | Carsten Dominik <dominik@science.uva.nl> |
---|---|
date | Sun, 27 Apr 2008 18:33:39 +0000 |
parents | |
children | da5141d2e8fc |
comparison
equal
deleted
inserted
replaced
94413:90289baecd6a | 94414:d86cb59eea9f |
---|---|
1 ;;; org-macs.el --- Top-level definitions for Org-mode | |
2 | |
3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. | |
4 | |
5 ;; Author: Carsten Dominik <carsten at orgmode dot org> | |
6 ;; Keywords: outlines, hypermedia, calendar, wp | |
7 ;; Homepage: http://orgmode.org | |
8 ;; Version: 6.02b | |
9 ;; | |
10 ;; This file is part of GNU Emacs. | |
11 ;; | |
12 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
13 ;; it under the terms of the GNU General Public License as published by | |
14 ;; the Free Software Foundation; either version 3, or (at your option) | |
15 ;; any later version. | |
16 | |
17 ;; GNU Emacs is distributed in the hope that it will be useful, | |
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 ;; GNU General Public License for more details. | |
21 | |
22 ;; You should have received a copy of the GNU General Public License | |
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
24 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
25 ;; Boston, MA 02110-1301, USA. | |
26 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | |
27 ;; | |
28 ;;; Commentary: | |
29 | |
30 ;; This file contains macro definitions, defsubst definitions, other | |
31 ;; stuff needed for compilation and top-level forms in Org-mode, as well | |
32 ;; lots of small functions that are not org-mode specific but simply | |
33 ;; generally useful stuff. | |
34 | |
35 ;;; Code: | |
36 | |
37 (defmacro org-bound-and-true-p (var) | |
38 "Return the value of symbol VAR if it is bound, else nil." | |
39 `(and (boundp (quote ,var)) ,var)) | |
40 | |
41 (defmacro org-unmodified (&rest body) | |
42 "Execute body without changing `buffer-modified-p'." | |
43 `(set-buffer-modified-p | |
44 (prog1 (buffer-modified-p) ,@body))) | |
45 | |
46 (defmacro org-re (s) | |
47 "Replace posix classes in regular expression." | |
48 (if (featurep 'xemacs) | |
49 (let ((ss s)) | |
50 (save-match-data | |
51 (while (string-match "\\[:alnum:\\]" ss) | |
52 (setq ss (replace-match "a-zA-Z0-9" t t ss))) | |
53 (while (string-match "\\[:alpha:\\]" ss) | |
54 (setq ss (replace-match "a-zA-Z" t t ss))) | |
55 ss)) | |
56 s)) | |
57 | |
58 (defmacro org-preserve-lc (&rest body) | |
59 `(let ((_line (org-current-line)) | |
60 (_col (current-column))) | |
61 (unwind-protect | |
62 (progn ,@body) | |
63 (goto-line _line) | |
64 (org-move-to-column _col)))) | |
65 | |
66 (defmacro org-without-partial-completion (&rest body) | |
67 `(let ((pc-mode (and (boundp 'partial-completion-mode) | |
68 partial-completion-mode))) | |
69 (unwind-protect | |
70 (progn | |
71 (if pc-mode (partial-completion-mode -1)) | |
72 ,@body) | |
73 (if pc-mode (partial-completion-mode 1))))) | |
74 | |
75 (eval-and-compile | |
76 (unless (fboundp 'declare-function) | |
77 (defmacro declare-function (fn file &optional arglist fileonly)))) | |
78 | |
79 (defmacro org-maybe-intangible (props) | |
80 "Add '(intangigble t) to PROPS if Emacs version is earlier than Emacs 22. | |
81 In emacs 21, invisible text is not avoided by the command loop, so the | |
82 intangible property is needed to make sure point skips this text. | |
83 In Emacs 22, this is not necessary. The intangible text property has | |
84 led to problems with flyspell. These problems are fixed in flyspell.el, | |
85 but we still avoid setting the property in Emacs 22 and later. | |
86 We use a macro so that the test can happen at compilation time." | |
87 (if (< emacs-major-version 22) | |
88 `(append '(intangible t) ,props) | |
89 props)) | |
90 | |
91 (defmacro org-with-point-at (pom &rest body) | |
92 "Move to buffer and point of point-or-marker POM for the duration of BODY." | |
93 `(save-excursion | |
94 (if (markerp pom) (set-buffer (marker-buffer pom))) | |
95 (save-excursion | |
96 (goto-char (or pom (point))) | |
97 ,@body))) | |
98 | |
99 (defmacro org-no-warnings (&rest body) | |
100 (cons (if (fboundp 'with-no-warnings) 'with-no-warnings 'progn) body)) | |
101 | |
102 (defmacro org-if-unprotected (&rest body) | |
103 "Execute BODY if there is no `org-protected' text property at point." | |
104 `(unless (get-text-property (point) 'org-protected) | |
105 ,@body)) | |
106 | |
107 (defmacro org-with-remote-undo (_buffer &rest _body) | |
108 "Execute BODY while recording undo information in two buffers." | |
109 `(let ((_cline (org-current-line)) | |
110 (_cmd this-command) | |
111 (_buf1 (current-buffer)) | |
112 (_buf2 ,_buffer) | |
113 (_undo1 buffer-undo-list) | |
114 (_undo2 (with-current-buffer ,_buffer buffer-undo-list)) | |
115 _c1 _c2) | |
116 ,@_body | |
117 (when org-agenda-allow-remote-undo | |
118 (setq _c1 (org-verify-change-for-undo | |
119 _undo1 (with-current-buffer _buf1 buffer-undo-list)) | |
120 _c2 (org-verify-change-for-undo | |
121 _undo2 (with-current-buffer _buf2 buffer-undo-list))) | |
122 (when (or _c1 _c2) | |
123 ;; make sure there are undo boundaries | |
124 (and _c1 (with-current-buffer _buf1 (undo-boundary))) | |
125 (and _c2 (with-current-buffer _buf2 (undo-boundary))) | |
126 ;; remember which buffer to undo | |
127 (push (list _cmd _cline _buf1 _c1 _buf2 _c2) | |
128 org-agenda-undo-list))))) | |
129 | |
130 (defmacro org-no-read-only (&rest body) | |
131 "Inhibit read-only for BODY." | |
132 `(let ((inhibit-read-only t)) ,@body)) | |
133 | |
134 (defconst org-rm-props '(invisible t face t keymap t intangible t mouse-face t | |
135 rear-nonsticky t mouse-map t fontified t) | |
136 "Properties to remove when a string without properties is wanted.") | |
137 | |
138 (defsubst org-match-string-no-properties (num &optional string) | |
139 (if (featurep 'xemacs) | |
140 (let ((s (match-string num string))) | |
141 (and s (remove-text-properties 0 (length s) org-rm-props s)) | |
142 s) | |
143 (match-string-no-properties num string))) | |
144 | |
145 (defsubst org-no-properties (s) | |
146 (if (fboundp 'set-text-properties) | |
147 (set-text-properties 0 (length s) nil s) | |
148 (remove-text-properties 0 (length s) org-rm-props s)) | |
149 s) | |
150 | |
151 (defsubst org-get-alist-option (option key) | |
152 (cond ((eq key t) t) | |
153 ((eq option t) t) | |
154 ((assoc key option) (cdr (assoc key option))) | |
155 (t (cdr (assq 'default option))))) | |
156 | |
157 (defsubst org-inhibit-invisibility () | |
158 "Modified `buffer-invisibility-spec' for Emacs 21. | |
159 Some ops with invisible text do not work correctly on Emacs 21. For these | |
160 we turn off invisibility temporarily. Use this in a `let' form." | |
161 (if (< emacs-major-version 22) nil buffer-invisibility-spec)) | |
162 | |
163 (defsubst org-set-local (var value) | |
164 "Make VAR local in current buffer and set it to VALUE." | |
165 (set (make-variable-buffer-local var) value)) | |
166 | |
167 (defsubst org-mode-p () | |
168 "Check if the current buffer is in Org-mode." | |
169 (eq major-mode 'org-mode)) | |
170 | |
171 (defsubst org-last (list) | |
172 "Return the last element of LIST." | |
173 (car (last list))) | |
174 | |
175 (defun org-let (list &rest body) | |
176 (eval (cons 'let (cons list body)))) | |
177 (put 'org-let 'lisp-indent-function 1) | |
178 | |
179 (defun org-let2 (list1 list2 &rest body) | |
180 (eval (cons 'let (cons list1 (list (cons 'let (cons list2 body))))))) | |
181 (put 'org-let2 'lisp-indent-function 2) | |
182 | |
183 (defsubst org-call-with-arg (command arg) | |
184 "Call COMMAND interactively, but pretend prefix are was ARG." | |
185 (let ((current-prefix-arg arg)) (call-interactively command))) | |
186 | |
187 (defsubst org-current-line (&optional pos) | |
188 (save-excursion | |
189 (and pos (goto-char pos)) | |
190 ;; works also in narrowed buffer, because we start at 1, not point-min | |
191 (+ (if (bolp) 1 0) (count-lines 1 (point))))) | |
192 | |
193 (defsubst org-pos-in-match-range (pos n) | |
194 (and (match-beginning n) | |
195 (<= (match-beginning n) pos) | |
196 (>= (match-end n) pos))) | |
197 | |
198 (defun org-autoload (file functions) | |
199 "Establish autoload for all FUNCTIONS in FILE, if not boutd already." | |
200 (let ((d (format "Documentation will be available after `%s.el' is loaded." | |
201 file)) | |
202 f) | |
203 (while (setq f (pop functions)) | |
204 (or (fboundp f) (autoload f file d t))))) | |
205 | |
206 (defun org-match-line (re) | |
207 "Looking-at at the beginning of the current line." | |
208 (save-excursion | |
209 (goto-char (point-at-bol)) | |
210 (looking-at re))) | |
211 | |
212 (defun org-plist-delete (plist property) | |
213 "Delete PROPERTY from PLIST. | |
214 This is in contrast to merely setting it to 0." | |
215 (let (p) | |
216 (while plist | |
217 (if (not (eq property (car plist))) | |
218 (setq p (plist-put p (car plist) (nth 1 plist)))) | |
219 (setq plist (cddr plist))) | |
220 p)) | |
221 | |
222 (provide 'org-macs) | |
223 | |
224 ;;; org-macs.el ends here |