mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-10-02 13:07:09 +02:00
parent 2a95a47c5f 16e0730342
commit 4f0b3bfe0c
53 changed files with 593 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -30,7 +30,7 @@
orgcard_letter.tex
orgcard.txt
org
org-install.el
org-loaddefs.el
org-version.el
doc/org-version.inc
org-*.tar*

2
Makefile
View File

@ -28,7 +28,7 @@ help helpall::
$(info make all - ditto)
$(info make compile - build Org ELisp files)
$(info make single - build Org ELisp files, single Emacs per source)
$(info make autoloads - create org-install.el to load Org in-place)
$(info make autoloads - create org-loaddefs.el to load Org in-place)
$(info make test - build Org ELisp files and run test suite)
helpall::
$(info make test-dirty - check without building first)

8
README_maintainer
View File

@ -196,13 +196,9 @@ So the way I have been doing things with Emacs is this:
Careful: Copy /org.texi/ and /orgcard.tex/ into the right places,
and also copy the lisp files with *two exceptions*: Do *not* copy
/org-colview-xemacs.el/ and /org-install.el/. The former does not
/org-colview-xemacs.el/ and /org-loaddefs.el/. The former does not
belong in Emacs. And the latter would actually be harmful because
Emacs generates its own autoloads. The Emacs distribution contains
an empty /org-install.el/, so that users can have =(require
'org-install)= in .emacs with no ill effects. So if you were to
copy /org-install.el/, you would overwrite that empty placeholder
file.
Emacs generates its own autoloads.
4. Generate the ChangeLog entries

24
contrib/lisp/org-track.el
View File

@ -32,6 +32,9 @@
;;
;;; Commentary:
;;
;; WARNING: This library is obsolete, you should use the make targets
;; to keep track of Org latest developments.
;;
;; Download the latest development tarball, unpack and optionally compile it
;;
;; Usage:
@ -46,15 +49,11 @@
;;
;; M-x org-track-update RET
(require 'url-parse)
(require 'url-handlers)
(autoload 'url-file-local-copy "url-handlers")
(autoload 'url-generic-parse-url "url-parse")
;;; Variables:
@ -66,7 +65,7 @@ To use org-track, adjust `org-track-directory'.
Org will download the archived latest git version for you,
unpack it into that directory (i.e. a subdirectory
`org-mode/' is added), create the autoloads file
`org-install.el' for you and, optionally, compile the
`org-loaddefs.el' for you and, optionally, compile the
sources.
All you'll have to do is call `M-x org-track-update' from
time to time."
@ -80,7 +79,7 @@ If that directory does not exist, it will be created."
(defcustom org-track-compile-sources t
"If `nil', never compile org-sources.
Org will only create the autoloads file `org-install.el' for
Org will only create the autoloads file `org-loaddefs.el' for
you then. If `t', compile the sources, too.
Note, that emacs preferes compiled elisp files over
non-compiled ones."
@ -102,8 +101,6 @@ you need to unpack it."
"Remove org-latest.tar.gz after updates?"
:type 'boolean)
;;; Frontend
@ -131,7 +128,6 @@ Also, generate autoloads and evtl. compile the sources."
(org-track-compile-org))
(error (message "%s" (error-message-string err)))))))
;;; tar related functions
@ -171,7 +167,6 @@ subdirectory org-mode/ to DIRECTORY."
(if org-track-remove-package
(delete-file target))))
;;; Compile Org-mode sources
@ -180,7 +175,7 @@ subdirectory org-mode/ to DIRECTORY."
;;;###autoload
(defun org-track-compile-org (&optional directory)
"Compile all *.el files that come with org-mode.
Generate the autoloads file `org-install.el'.
Generate the autoloads file `org-loaddefs.el'.
DIRECTORY is where the directory org-mode/ lives (i.e. the
parent directory of your local repo."
@ -193,15 +188,15 @@ DIRECTORY is where the directory org-mode/ lives (i.e. the
"/")))
(add-to-list 'load-path directory)
(let ((list-of-org-files (file-expand-wildcards (concat directory "*.el"))))
;; create the org-install file
;; create the org-loaddefs file
(require 'autoload)
(setq esf/org-install-file (concat directory "org-install.el"))
(setq esf/org-install-file (concat directory "org-loaddefs.el"))
(find-file esf/org-install-file)
(erase-buffer)
(mapc (lambda (x)
(generate-file-autoloads x))
list-of-org-files)
(insert "\n(provide (quote org-install))\n")
(insert "\n(provide (quote org-loaddefs))\n")
(save-buffer)
(kill-buffer)
(byte-compile-file esf/org-install-file t)
@ -213,7 +208,6 @@ DIRECTORY is where the directory org-mode/ lives (i.e. the
(if org-track-compile-sources
(mapc (lambda (f) (byte-compile-file f)) list-of-org-files))))
(provide 'org-track)
;;; org-track.el ends here

13
doc/org.texi
View File

@ -965,13 +965,6 @@ on your system).
make install-info
@end example
Then add the following line to @file{.emacs}. It is needed so that
Emacs can autoload functions that are located in files not immediately loaded
when Org mode starts.
@lisp
(require 'org-install)
@end lisp
Do not forget to activate Org as described in the following section.
@page
@ -1093,9 +1086,6 @@ shown below.
;; add latest org-mode to load path
(add-to-list 'load-path (expand-file-name "/path/to/org-mode/lisp"))
(add-to-list 'load-path (expand-file-name "/path/to/org-mode/contrib/lisp" t))
;; activate org
(require 'org-install)
@end example
If an error occurs, a backtrace can be very useful (see below on how to
@ -14547,14 +14537,13 @@ Be sure to adjust the paths to fit your system.
#
DIR=`pwd`
FILES=""
ORGINSTALL="~/src/org/lisp/org-install.el"
# wrap each argument in the code required to call tangle on it
for i in $@@; do
FILES="$FILES \"$i\""
done
emacs -Q --batch -l $ORGINSTALL \
emacs -Q --batch \
--eval "(progn
(add-to-list 'load-path (expand-file-name \"~/src/org/lisp/\"))
(add-to-list 'load-path (expand-file-name \"~/src/org/contrib/lisp/\" t))

7
doc/orgguide.texi
View File

@ -271,13 +271,6 @@ command:
make
@end smallexample
Then add the following line to @file{.emacs}. It is needed so that
Emacs can autoload functions that are located in files not immediately loaded
when Org-mode starts.
@smalllisp
(require 'org-install)
@end smalllisp
@node Activation, Feedback, Installation, Introduction
@section Activation

2
lisp/Makefile
View File

@ -5,7 +5,7 @@ ifeq ($(MAKELEVEL), 0)
endif
LISPV = org-version.el
LISPI = org-install.el
LISPI = org-loaddefs.el
LISPA = $(LISPV) $(LISPI)
LISPF = $(filter-out $(LISPA),$(sort $(wildcard *.el)))
LISPC = $(filter-out $(LISPN:%el=%elc),$(LISPF:%el=%elc))

2
lisp/ob-haskell.el
View File

@ -147,6 +147,8 @@ specifying a variable of the same value."
(format "%S" var)))
(defvar org-src-preserve-indentation)
(declare-function org-export-as-latex "org-latex"
(arg &optional hidden ext-plist to-buffer body-only pub-dir))
(defun org-babel-haskell-export-to-lhs (&optional arg)
"Export to a .lhs file with all haskell code blocks escaped.
When called with a prefix argument the resulting

2
lisp/ob-io.el
View File

@ -38,12 +38,12 @@
(require 'ob-eval)
(eval-when-compile (require 'cl))
(defvar org-babel-tangle-lang-exts) ;; Autoloaded
(add-to-list 'org-babel-tangle-lang-exts '("io" . "io"))
(defvar org-babel-default-header-args:io '())
(defvar org-babel-io-command "io"
"Name of the command to use for executing Io code.")
(defun org-babel-execute:io (body params)
"Execute a block of Io code with org-babel. This function is
called by `org-babel-execute-src-block'"

4
lisp/ob-keys.el
View File

@ -98,6 +98,8 @@ a-list placed behind the generic `org-babel-key-prefix'.")
(provide 'ob-keys)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; ob-keys.el ends here

5
lisp/ob-lob.el
View File

@ -45,7 +45,6 @@ To add files to this list use the `org-babel-lob-ingest' command."
(defvar org-babel-default-lob-header-args '((:exports . "results"))
"Default header arguments to use when exporting #+lob/call lines.")
;;;###autoload
(defun org-babel-lob-ingest (&optional file)
"Add all named source-blocks defined in FILE to
`org-babel-library-of-babel'."
@ -143,6 +142,8 @@ if so then run the appropriate source block from the Library."
(provide 'ob-lob)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; ob-lob.el ends here

1
lisp/ob-picolisp.el
View File

@ -60,6 +60,7 @@
(eval-when-compile (require 'cl))
(declare-function run-picolisp "ext:inferior-picolisp" (cmd))
(defvar org-babel-tangle-lang-exts) ;; Autoloaded
;; optionally define a file extension for this language
(add-to-list 'org-babel-tangle-lang-exts '("picolisp" . "l"))

1
lisp/ob-ref.el
View File

@ -59,6 +59,7 @@
(declare-function org-at-item-p "org-list" ())
(declare-function org-narrow-to-subtree "org" ())
(declare-function org-id-find-id-in-file "org-id" (id file &optional markerp))
(declare-function org-id-find-id-file "org-id" (id))
(declare-function org-show-context "org" (&optional key))
(declare-function org-pop-to-buffer-same-window
"org-compat" (&optional buffer-or-name norecord label))

2
lisp/ob-scala.el
View File

@ -36,12 +36,12 @@
(require 'ob-eval)
(eval-when-compile (require 'cl))
(defvar org-babel-tangle-lang-exts) ;; Autoloaded
(add-to-list 'org-babel-tangle-lang-exts '("scala" . "scala"))
(defvar org-babel-default-header-args:scala '())
(defvar org-babel-scala-command "scala"
"Name of the command to use for executing Scala code.")
(defun org-babel-execute:scala (body params)
"Execute a block of Scala code with org-babel. This function is
called by `org-babel-execute-src-block'"

3
lisp/ob-sql.el
View File

@ -47,7 +47,8 @@
(eval-when-compile (require 'cl))
(declare-function org-table-import "org-table" (file arg))
(declare-function orgtbl-to-csv "org-table" (TABLE PARAMS))
(declare-function orgtbl-to-csv "org-table" (table params))
(declare-function org-table-to-lisp "org-table" (&optional txt))
(defvar org-babel-default-header-args:sql '())

3
lisp/ob-sqlite.el
View File

@ -33,7 +33,8 @@
(declare-function org-fill-template "org" (template alist))
(declare-function org-table-convert-region "org-table"
(beg0 end0 &optional separator))
(declare-function orgtbl-to-csv "org-table" (TABLE PARAMS))
(declare-function orgtbl-to-csv "org-table" (table params))
(declare-function org-table-to-lisp "org-table" (&optional txt))
(defvar org-babel-default-header-args:sqlite '())

5
lisp/ob-tangle.el
View File

@ -38,7 +38,6 @@
(declare-function org-babel-update-block-body "org" (new-body))
(declare-function make-directory "files" (dir &optional parents))
;;;###autoload
(defcustom org-babel-tangle-lang-exts
'(("emacs-lisp" . "el"))
"Alist mapping languages to their file extensions.
@ -514,6 +513,8 @@ which enable the original code blocks to be found."
(provide 'ob-tangle)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; ob-tangle.el ends here

9
lisp/ob.el
View File

@ -89,6 +89,7 @@
(declare-function org-completing-read "org" (&rest args))
(declare-function org-escape-code-in-region "org-src" (beg end))
(declare-function org-unescape-code-in-string "org-src" (s))
(declare-function org-table-to-lisp "org-table" (&optional txt))
(defgroup org-babel nil
"Code block evaluation and management in `org-mode' documents."
@ -492,8 +493,8 @@ can not be resolved.")
;;; functions
(defvar call-process-region)
;;;###autoload
;;;###autoload
(defun org-babel-execute-src-block (&optional arg info params)
"Execute the current source code block.
Insert the results of execution into the buffer. Source code
@ -836,6 +837,7 @@ evaluation mechanisms."
(key-binding (or key (read-key-sequence nil))))))
(defvar org-bracket-link-regexp)
;;;###autoload
(defun org-babel-open-src-block-result (&optional re-run)
"If `point' is on a src block then open the results of the
@ -942,6 +944,7 @@ buffer."
(def-edebug-spec org-babel-map-inline-src-blocks (form body))
(defvar org-babel-lob-one-liner-regexp)
;;;###autoload
(defmacro org-babel-map-call-lines (file &rest body)
"Evaluate BODY forms on each call line in FILE.
@ -2586,6 +2589,8 @@ of `org-babel-temporary-directory'."
(provide 'ob)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; ob.el ends here

260
lisp/org-agenda.el
View File

@ -1886,6 +1886,7 @@ When nil, `q' will kill the single agenda buffer."
:version "24.3"
:type 'boolean)
;;;###autoload
(defun org-toggle-sticky-agenda (&optional arg)
"Toggle `org-agenda-sticky'."
@ -1903,6 +1904,11 @@ When nil, `q' will kill the single agenda buffer."
(message "Sticky agenda was %s"
(if org-agenda-sticky "enabled" "disabled"))))))
(autoload 'org-toggle-sticky-agenda "org-agenda" "\
Toggle `org-agenda-sticky'.
\(fn &optional ARG)" t nil)
(defvar org-agenda-buffer nil
"Agenda buffer currently being generated.")
@ -2578,6 +2584,43 @@ Pressing `<' twice means to restrict to the current subtree or region
((equal org-keys "!") (customize-variable 'org-stuck-projects))
(t (error "Invalid agenda key"))))))
(autoload 'org-agenda "org-agenda" "\
Dispatch agenda commands to collect entries to the agenda buffer.
Prompts for a command to execute. Any prefix arg will be passed
on to the selected command. The default selections are:
a Call `org-agenda-list' to display the agenda for current day or week.
t Call `org-todo-list' to display the global todo list.
T Call `org-todo-list' to display the global todo list, select only
entries with a specific TODO keyword (the user gets a prompt).
m Call `org-tags-view' to display headlines with tags matching
a condition (the user is prompted for the condition).
M Like `m', but select only TODO entries, no ordinary headlines.
L Create a timeline for the current buffer.
e Export views to associated files.
s Search entries for keywords.
S Search entries for keywords, only with TODO keywords.
/ Multi occur across all agenda files and also files listed
in `org-agenda-text-search-extra-files'.
< Restrict agenda commands to buffer, subtree, or region.
Press several times to get the desired effect.
> Remove a previous restriction.
# List \"stuck\" projects.
! Configure what \"stuck\" means.
C Configure custom agenda commands.
More commands can be added by configuring the variable
`org-agenda-custom-commands'. In particular, specific tags and TODO keyword
searches can be pre-defined in this way.
If the current buffer is in Org-mode and visiting a file, you can also
first press `<' once to indicate that the agenda should be temporarily
\(until the next use of \\[org-agenda]) restricted to the current file.
Pressing `<' twice means to restrict to the current subtree or region
\(if active).
\(fn &optional ARG ORG-KEYS RESTRICTION)" t nil)
(defun org-agenda-append-agenda ()
"Append another agenda view to the current one.
This function allows interactive building of block agendas.
@ -2872,6 +2915,16 @@ before running the agenda command."
(org-agenda nil cmd-key)))
(set-buffer org-agenda-buffer-name)
(princ (buffer-string)))
(autoload 'org-batch-agenda "org-agenda" "\
Run an agenda command in batch mode and send the result to STDOUT.
If CMD-KEY is a string of length 1, it is used as a key in
`org-agenda-custom-commands' and triggers this command. If it is a
longer string it is used as a tags/todo match string.
Parameters are alternating variable names and values that will be bound
before running the agenda command.
\(fn CMD-KEY &rest PARAMETERS)" nil t)
(def-edebug-spec org-batch-agenda (form &rest sexp))
(defvar org-agenda-info nil)
@ -2930,6 +2983,43 @@ agenda-day The day in the agenda where this is listed"
priority-letter priority agenda-day)
","))
(princ "\n")))))
(autoload 'org-batch-agenda-csv "org-agenda" "\
Run an agenda command in batch mode and send the result to STDOUT.
If CMD-KEY is a string of length 1, it is used as a key in
`org-agenda-custom-commands' and triggers this command. If it is a
longer string it is used as a tags/todo match string.
Parameters are alternating variable names and values that will be bound
before running the agenda command.
The output gives a line for each selected agenda item. Each
item is a list of comma-separated values, like this:
category,head,type,todo,tags,date,time,extra,priority-l,priority-n
category The category of the item
head The headline, without TODO kwd, TAGS and PRIORITY
type The type of the agenda entry, can be
todo selected in TODO match
tagsmatch selected in tags match
diary imported from diary
deadline a deadline on given date
scheduled scheduled on given date
timestamp entry has timestamp on given date
closed entry was closed on given date
upcoming-deadline warning about deadline
past-scheduled forwarded scheduled item
block entry has date block including g. date
todo The todo keyword, if any
tags All tags including inherited ones, separated by colons
date The relevant date, like 2007-2-14
time The time, like 15:00-16:50
extra Sting with extra planning info
priority-l The priority letter if any was given
priority-n The computed numerical priority
agenda-day The day in the agenda where this is listed
\(fn CMD-KEY &rest PARAMETERS)" nil t)
(def-edebug-spec org-batch-agenda-csv (form &rest sexp))
(defun org-fix-agenda-info (props)
@ -2979,6 +3069,11 @@ This ensures the export commands can easily use it."
(interactive)
(eval (list 'org-batch-store-agenda-views)))
(autoload 'org-store-agenda-views "org-agenda" "\
\(fn &rest PARAMETERS)" t nil)
;;;###autoload
(defmacro org-batch-store-agenda-views (&rest parameters)
"Run all custom agenda commands that have a file argument."
@ -3013,6 +3108,11 @@ This ensures the export commands can easily use it."
(org-agenda-write (expand-file-name (pop files) dir) nil t bufname)))
(and (get-buffer bufname)
(kill-buffer bufname)))))))
(autoload 'org-batch-store-agenda-views "org-agenda" "\
Run all custom agenda commands that have a file argument.
\(fn &rest PARAMETERS)" nil t)
(def-edebug-spec org-batch-store-agenda-views (&rest sexp))
(defvar org-agenda-current-span nil
@ -4017,7 +4117,7 @@ given in `org-agenda-start-on-weekday'."
""
x))
filter ""))))
(setq tbl (apply 'org-get-clocktable p))
(setq tbl (apply 'org-clock-get-clocktable p))
(insert tbl)))
(goto-char (point-min))
(or org-agenda-multi (org-agenda-fit-window-to-buffer))
@ -4041,6 +4141,20 @@ given in `org-agenda-start-on-weekday'."
(setq buffer-read-only t)
(message ""))))
(autoload 'org-agenda-list "org-agenda" "\
Produce a daily/weekly view from all files in variable `org-agenda-files'.
The view will be for the current day or week, but from the overview buffer
you will be able to go to other days/weeks.
With a numeric prefix argument in an interactive call, the agenda will
span ARG days. Lisp programs should instead specify SPAN to change
the number of days. SPAN defaults to `org-agenda-span'.
START-DAY defaults to TODAY, or to the most recent match for the weekday
given in `org-agenda-start-on-weekday'.
\(fn &optional ARG START-DAY SPAN)" t nil)
(defun org-agenda-ndays-to-span (n)
"Return a span symbol for a span of N days, or N if none matches."
(cond ((symbolp n) n)
@ -4345,6 +4459,52 @@ in `org-agenda-text-search-extra-files'."
(org-agenda-finalize)
(setq buffer-read-only t))))
(autoload 'org-search-view "org-agenda" "\
Show all entries that contain a phrase or words or regular expressions.
With optional prefix argument TODO-ONLY, only consider entries that are
TODO entries. The argument STRING can be used to pass a default search
string into this function. If EDIT-AT is non-nil, it means that the
user should get a chance to edit this string, with cursor at position
EDIT-AT.
The search string can be viewed either as a phrase that should be found as
is, or it can be broken into a number of snippets, each of which must match
in a Boolean way to select an entry. The default depends on the variable
`org-agenda-search-view-always-boolean'.
Even if this is turned off (the default) you can always switch to
Boolean search dynamically by preceding the first word with \"+\" or \"-\".
The default is a direct search of the whole phrase, where each space in
the search string can expand to an arbitrary amount of whitespace,
including newlines.
If using a Boolean search, the search string is split on whitespace and
each snippet is searched separately, with logical AND to select an entry.
Words prefixed with a minus must *not* occur in the entry. Words without
a prefix or prefixed with a plus must occur in the entry. Matching is
case-insensitive. Words are enclosed by word delimiters (i.e. they must
match whole words, not parts of a word) if
`org-agenda-search-view-force-full-words' is set (default is nil).
Boolean search snippets enclosed by curly braces are interpreted as
regular expressions that must or (when preceded with \"-\") must not
match in the entry. Snippets enclosed into double quotes will be taken
as a whole, to include whitespace.
- If the search string starts with an asterisk, search only in headlines.
- If (possibly after the leading star) the search string starts with an
exclamation mark, this also means to look at TODO entries only, an effect
that can also be achieved with a prefix argument.
- If (possibly after star and exclamation mark) the search string starts
with a colon, this will mean that the (non-regexp) snippets of the
Boolean search must match as full words.
This command searches the agenda files, and in addition the files listed
in `org-agenda-text-search-extra-files'.
\(fn &optional TODO-ONLY STRING EDIT-AT)" t nil)
;;; Agenda TODO list
(defvar org-select-this-todo-keyword nil)
@ -4435,6 +4595,15 @@ for a keyword. A numeric prefix directly selects the Nth keyword in
(org-agenda-finalize)
(setq buffer-read-only t))))
(autoload 'org-todo-list "org-agenda" "\
Show all (not done) TODO entries from all agenda file in a single list.
The prefix arg can be used to select a specific TODO keyword and limit
the list to these. When using \\[universal-argument], you will be prompted
for a keyword. A numeric prefix directly selects the Nth keyword in
`org-todo-keywords-1'.
\(fn &optional ARG)" t nil)
;;; Agenda tags match
;;;###autoload
@ -4520,6 +4689,12 @@ The prefix arg TODO-ONLY limits the search to TODO entries."
(org-agenda-finalize)
(setq buffer-read-only t))))
(autoload 'org-tags-view "org-agenda" "\
Show all headlines for all `org-agenda-files' matching a TAGS criterion.
The prefix arg TODO-ONLY limits the search to TODO entries.
\(fn &optional TODO-ONLY MATCH)" t nil)
;;; Agenda Finding stuck projects
(defvar org-agenda-skip-regexp nil
@ -4748,6 +4923,14 @@ of what a project is and how to check if it stuck, customize the variable
(setq org-agenda-redo-command
`(org-agenda-list-stuck-projects ,current-prefix-arg)))))
(autoload 'org-agenda-list-stuck-projects "org-agenda" "\
Create agenda view for projects that are stuck.
Stuck projects are project that have no next actions. For the definitions
of what a project is and how to check if it stuck, customize the variable
`org-stuck-projects'.
\(fn &rest IGNORE)" t nil)
;;; Diary integration
(defvar org-disable-agenda-to-diary nil) ;Dynamically-scoped param.
@ -4926,6 +5109,35 @@ function from a program - use `org-agenda-get-day-entries' instead."
(if results
(concat (org-agenda-finalize-entries results) "\n"))))
(autoload 'org-diary "org-agenda" "\
Return diary information from org files.
This function can be used in a \"sexp\" diary entry in the Emacs calendar.
It accesses org files and extracts information from those files to be
listed in the diary. The function accepts arguments specifying what
items should be listed. For a list of arguments allowed here, see the
variable `org-agenda-entry-types'.
The call in the diary file should look like this:
&%%(org-diary) ~/path/to/some/orgfile.org
Use a separate line for each org file to check. Or, if you omit the file name,
all files listed in `org-agenda-files' will be checked automatically:
&%%(org-diary)
If you don't give any arguments (as in the example above), the default
arguments (:deadline :scheduled :timestamp :sexp) are used.
So the example above may also be written as
&%%(org-diary :deadline :timestamp :sexp :scheduled)
The function expects the lisp variables `entry' and `date' to be provided
by the caller, because this is how the calendar works. Don't use this
function from a program - use `org-agenda-get-day-entries' instead.
\(fn &rest ARGS)" nil nil)
;;; Agenda entry finders
(defun org-agenda-get-day-entries (file date &rest args)
@ -5055,7 +5267,6 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
(>= days n)
(<= days n))))
;;;###autoload
(defun org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item
(&optional end)
"Do we have a reason to ignore this TODO entry because it has a time stamp?"
@ -5124,6 +5335,11 @@ This function is invoked if `org-agenda-todo-ignore-deadlines',
(match-string 1) org-agenda-todo-ignore-timestamp))
(t))))))))))
(autoload 'org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item "org-agenda" "\
Do we have a reason to ignore this TODO entry because it has a time stamp?
\(fn &optional END)" nil nil)
(defconst org-agenda-no-heading-message
"No heading for this item in buffer or region.")
@ -8812,6 +9028,12 @@ This is a command that has to be installed in `calendar-mode-map'."
(calendar-cursor-to-date))
nil))
(autoload 'org-calendar-goto-agenda "org-agenda" "\
Compute the Org-mode agenda for the calendar date displayed at the cursor.
This is a command that has to be installed in `calendar-mode-map'.
\(fn)" t nil)
(defun org-agenda-convert-date ()
(interactive)
(org-agenda-check-type t 'agenda 'timeline)
@ -9254,6 +9476,40 @@ to override `appt-message-warning-time'."
(message "No event to add")
(message "Added %d event%s for today" cnt (if (> cnt 1) "s" "")))))
(autoload 'org-agenda-to-appt "org-agenda" "\
Activate appointments found in `org-agenda-files'.
With a \\[universal-argument] prefix, refresh the list of
appointments.
If FILTER is t, interactively prompt the user for a regular
expression, and filter out entries that don't match it.
If FILTER is a string, use this string as a regular expression
for filtering entries out.
If FILTER is a function, filter out entries against which
calling the function returns nil. This function takes one
argument: an entry from `org-agenda-get-day-entries'.
FILTER can also be an alist with the car of each cell being
either 'headline or 'category. For example:
'((headline \"IMPORTANT\")
(category \"Work\"))
will only add headlines containing IMPORTANT or headlines
belonging to the \"Work\" category.
ARGS are symbols indicating what kind of entries to consider.
By default `org-agenda-to-appt' will use :deadline, :scheduled
and :timestamp entries. See the docstring of `org-diary' for
details and examples.
If an entry as a APPT_WARNTIME property, its value will be used
to override `appt-message-warning-time'.
\(fn &optional REFRESH FILTER &rest ARGS)" t nil)
(defun org-agenda-todayp (date)
"Does DATE mean today, when considering `org-extend-today-until'?"
(let ((today (org-today))

7
lisp/org-archive.el
View File

@ -181,6 +181,7 @@ if LOCATION is not given, the value of `org-archive-location' is used."
(file-name-nondirectory
(buffer-file-name (buffer-base-buffer))))))
;;;###autoload
(defun org-archive-subtree (&optional find-done)
"Move the current subtree to the archive.
The archive can be a certain top-level heading in the current file, or in
@ -369,6 +370,7 @@ this heading."
(if (looking-at "^[ \t]*$")
(outline-next-visible-heading 1))))
;;;###autoload
(defun org-archive-to-archive-sibling ()
"Archive the current heading by moving it under the archive sibling.
The archive sibling is a sibling of the heading with the heading name
@ -483,6 +485,7 @@ When TAG is non-nil, don't move trees, but mark them with the ARCHIVE tag."
(goto-char end)))))
(message "%d trees archived" cntarch)))
;;;###autoload
(defun org-toggle-archive-tag (&optional find-done)
"Toggle the archive tag for the current headline.
With prefix ARG, check all children of current headline and offer tagging
@ -537,4 +540,8 @@ This command is set with the variable `org-archive-default-command'."
(provide 'org-archive)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-archive.el ends here

5
lisp/org-ascii.el
View File

@ -553,6 +553,7 @@ publishing directory."
(kill-buffer (current-buffer)))
(current-buffer))))
;;;###autoload
(defun org-export-ascii-preprocess (parameters)
"Do extra work for ASCII export."
;;
@ -726,4 +727,8 @@ publishing directory."
(provide 'org-ascii)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-ascii.el ends here

4
lisp/org-attach.el
View File

@ -451,4 +451,8 @@ prefix."
(provide 'org-attach)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-attach.el ends here

6
lisp/org-bbdb.el
View File

@ -338,7 +338,7 @@ This is used by Org to re-create the anniversary hash table."
(add-hook 'bbdb-after-change-hook 'org-bbdb-updated)
;;;###autoload
(defun org-bbdb-anniversaries()
(defun org-bbdb-anniversaries ()
"Extract anniversaries from BBDB for display in the agenda."
(require 'bbdb)
(require 'diary-lib)
@ -433,4 +433,8 @@ END:VEVENT\n"
(provide 'org-bbdb)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-bbdb.el ends here

3
lisp/org-beamer.el
View File

@ -228,7 +228,7 @@ the tag does not have any semantic meaning."
(org-entry-put nil "BEAMER_env" (match-string 1 tags)))
(t (org-entry-delete nil "BEAMER_env"))))))
;;;###autoload
(defun org-beamer-sectioning (level text)
"Return the sectioning entry for the current headline.
LEVEL is the reduced level of the headline.
@ -370,6 +370,7 @@ org-beamer-extra are all scoped into this function dynamically."
"The keymap for `org-beamer-mode'.")
(define-key org-beamer-mode-map "\C-c\C-b" 'org-beamer-select-environment)
;;;###autoload
(define-minor-mode org-beamer-mode
"Special support for editing Org-mode files made to export to beamer."
nil " Bm" nil)

5
lisp/org-capture.el
View File

@ -434,9 +434,10 @@ Turning on this mode runs the normal hook `org-capture-mode-hook'."
;;; The main commands
;;;###autoload
(defvar org-capture-initial nil)
(defvar org-capture-entry nil)
;;;###autoload
(defun org-capture-string (string &optional keys)
(interactive "sInitial text: \n")
(let ((org-capture-initial string)
@ -1280,7 +1281,7 @@ Point will remain at the first line after the inserted text."
(goto-char pos)))
(defvar org-clock-marker) ; Defined in org.el
;;;###autoload
(defun org-capture-insert-template-here ()
(let* ((template (org-capture-get :template))
(type (org-capture-get :type))

64
lisp/org-clock.el
View File

@ -973,6 +973,7 @@ to be CLOCKED OUT.")))
(not (memq ch '(?K ?G ?S ?C))))
fail-quietly)))))
;;;###autoload
(defun org-resolve-clocks (&optional only-dangling-p prompt-fn last-valid)
"Resolve all currently open org-mode clocks.
If `only-dangling-p' is non-nil, only ask to resolve dangling
@ -1070,6 +1071,8 @@ so long."
(setq org-clock-current-task nil))
(defvar org-clock-out-time nil) ; store the time of the last clock-out
;;;###autoload
(defun org-clock-in (&optional select start-time)
"Start the clock on the current item.
If necessary, clock-out of the currently active clock.
@ -1439,6 +1442,7 @@ line and position cursor in that line."
(and (re-search-forward org-property-end-re nil t)
(goto-char (match-beginning 0))))))))
;;;###autoload
(defun org-clock-out (&optional switch-to-state fail-quietly at-time)
"Stop the currently running clock.
Throw an error if there is no running clock and FAIL-QUIETLY is nil.
@ -1598,6 +1602,7 @@ UPDOWN tells whether to change 'up or 'down."
((eq org-ts-what 'year) (* 24 3600 365.2)))))
org-ts-what 'updown)))))))
;;;###autoload
(defun org-clock-cancel ()
"Cancel the running clock by removing the start timestamp."
(interactive)
@ -1624,6 +1629,7 @@ UPDOWN tells whether to change 'up or 'down."
(message "Clock canceled")
(run-hooks 'org-clock-cancel-hook))
;;;###autoload
(defun org-clock-goto (&optional select)
"Go to the currently clocked-in entry, or to the most recently clocked one.
With prefix arg SELECT, offer recently clocked tasks for selection."
@ -1662,6 +1668,7 @@ With prefix arg SELECT, offer recently clocked tasks for selection."
(let ((range (org-clock-special-range 'today)))
(org-clock-sum (car range) (cadr range) nil :org-clock-minutes-today)))
;;;###autoload
(defun org-clock-sum (&optional tstart tend headline-filter propname)
"Sum the times for each subtree.
Puts the resulting times in minutes as a text property on each headline.
@ -1760,6 +1767,7 @@ PROPNAME lets you set a custom text property instead of :org-clock-minutes."
(org-clock-sum tstart)
org-clock-file-total-minutes)))
;;;###autoload
(defun org-clock-display (&optional total-only)
"Show subtree times in the entire buffer.
If TOTAL-ONLY is non-nil, only show the total time for the entire file
@ -1870,7 +1878,7 @@ and is only done if the variable `org-clock-out-when-done' is not nil."
'org-clock-out-if-current)
;;;###autoload
(defun org-get-clocktable (&rest props)
(defun org-clock-get-clocktable (&rest props)
"Get a formatted clocktable with parameters according to PROPS.
The table is created in a temporary buffer, fully formatted and
fontified, and then returned."
@ -1890,6 +1898,7 @@ fontified, and then returned."
(re-search-forward "^[ \t]*#\\+END" nil t)
(point-at-bol)))))
;;;###autoload
(defun org-clock-report (&optional arg)
"Create a table containing a report about clocked time.
If the cursor is inside an existing clocktable block, then the table
@ -2176,6 +2185,7 @@ the currently selected interval size."
(org-update-dblock)
t)))))
;;;###autoload
(defun org-dblock-write:clocktable (params)
"Write the standard clocktable."
(setq params (org-combine-plists org-clocktable-defaults params))
@ -2686,6 +2696,48 @@ This function is made for clock tables."
(defvar org-clock-loaded nil
"Was the clock file loaded?")
(defun org-clock-update-time-maybe ()
"If this is a CLOCK line, update it and return t.
Otherwise, return nil."
(interactive)
(save-excursion
(beginning-of-line 1)
(skip-chars-forward " \t")
(when (looking-at org-clock-string)
(let ((re (concat "[ \t]*" org-clock-string
" *[[<]\\([^]>]+\\)[]>]\\(-+[[<]\\([^]>]+\\)[]>]"
"\\([ \t]*=>.*\\)?\\)?"))
ts te h m s neg)
(cond
((not (looking-at re))
nil)
((not (match-end 2))
(when (and (equal (marker-buffer org-clock-marker) (current-buffer))
(> org-clock-marker (point))
(<= org-clock-marker (point-at-eol)))
;; The clock is running here
(setq org-clock-start-time
(apply 'encode-time
(org-parse-time-string (match-string 1))))
(org-clock-update-mode-line)))
(t
(and (match-end 4) (delete-region (match-beginning 4) (match-end 4)))
(end-of-line 1)
(setq ts (match-string 1)
te (match-string 3))
(setq s (- (org-float-time
(apply 'encode-time (org-parse-time-string te)))
(org-float-time
(apply 'encode-time (org-parse-time-string ts))))
neg (< s 0)
s (abs s)
h (floor (/ s 3600))
s (- s (* 3600 h))
m (floor (/ s 60))
s (- s (* 60 s)))
(insert " => " (format (if neg "-%d:%02d" "%2d:%02d") h m))
t))))))
(defun org-clock-save ()
"Persist various clock-related data to disk.
The details of what will be saved are regulated by the variable
@ -2777,15 +2829,13 @@ The details of what will be saved are regulated by the variable
(if (outline-invisible-p)
(org-show-context))))))))))
;;;###autoload
(defun org-clock-persistence-insinuate ()
"Set up hooks for clock persistence."
(add-hook 'org-mode-hook 'org-clock-load)
(add-hook 'kill-emacs-hook 'org-clock-save))
;; Suggested bindings
(org-defkey org-mode-map "\C-c\C-x\C-e" 'org-clock-modify-effort-estimate)
(provide 'org-clock)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-clock.el ends here

4
lisp/org-colview.el
View File

@ -686,6 +686,7 @@ around it."
(move-marker org-columns-top-level-marker org-entry-property-inherited-from)
(move-marker org-columns-top-level-marker (point))))
;;;###autoload
(defun org-columns (&optional columns-fmt-string)
"Turn on column view on an org-mode file.
When COLUMNS-FMT-STRING is non-nil, use it as the column format."
@ -1222,6 +1223,7 @@ of fields."
(push row tbl)))))
(append (list title 'hline) (nreverse tbl)))))
;;;###autoload
(defun org-dblock-write:columnview (params)
"Write the column view table.
PARAMS is a property list of parameters:
@ -1334,6 +1336,7 @@ and tailing newline characters."
(t (error "Garbage in listtable: %s" x))))
tbl "\n"))
;;;###autoload
(defun org-insert-columns-dblock ()
"Create a dynamic block capturing a column view table."
(interactive)
@ -1357,6 +1360,7 @@ and tailing newline characters."
(defvar org-agenda-columns-compute-summary-properties); defined in org-agenda.el
(defvar org-agenda-columns-add-appointments-to-effort-sum); as well
;;;###autoload
(defun org-agenda-columns ()
"Turn on or update column view in the agenda."
(interactive)

4
lisp/org-datetree.el
View File

@ -207,4 +207,8 @@ before running this command, even though the command tries to be smart."
(provide 'org-datetree)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-datetree.el ends here

4
lisp/org-docbook.el
View File

@ -1451,4 +1451,8 @@ the alist of previous items."
(provide 'org-docbook)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-docbook.el ends here

6
lisp/org-element.el
View File

@ -4473,6 +4473,10 @@ end of ELEM-A."
(cdr overlays)))
(goto-char (org-element-property :end elem-B)))))
(provide 'org-element)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-element.el ends here

5
lisp/org-exp.el
View File

@ -3230,7 +3230,6 @@ Does include HTML export options as well as TODO and CATEGORY stuff."
org-archive-location
"org file:~/org/%s.org"))
;;;###autoload
(defun org-insert-export-options-template ()
"Insert into the buffer a template with information for exporting."
(interactive)
@ -3348,4 +3347,8 @@ The depends on the variable `org-export-copy-to-kill-ring'."
(provide 'org-exp)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-exp.el ends here

4
lisp/org-feed.el
View File

@ -695,4 +695,8 @@ formatted as a string, not the original XML data."
(provide 'org-feed)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-feed.el ends here

4
lisp/org-footnote.el
View File

@ -948,4 +948,8 @@ If LABEL is non-nil, delete that footnote instead."
(provide 'org-footnote)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-footnote.el ends here

6
lisp/org-freemind.el
View File

@ -1219,8 +1219,8 @@ PATH should be a list of steps, where each step has the form
(provide 'org-freemind)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-freemind.el ends here

6
lisp/org-html.el
View File

@ -210,6 +210,7 @@ not be modified. Use the variables `org-export-html-style' to add
your own style information."
:group 'org-export-html
:type 'boolean)
;;;###autoload
(put 'org-export-html-style-include-default 'safe-local-variable 'booleanp)
@ -2380,7 +2381,6 @@ the settings define in the org-... variables."
(plist-get htmlize-buffer-places 'content-end)))
(kill-buffer htmlbuf))))
;;;###autoload
(defun org-export-htmlize-generate-css ()
"Create the CSS for all font definitions in the current Emacs session.
Use this to create face definitions in your CSS style file that can then
@ -2749,4 +2749,8 @@ the alist of previous items."
(provide 'org-html)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-html.el ends here

4
lisp/org-icalendar.el
View File

@ -684,4 +684,8 @@ a time), or the day by one (if it does not contain a time)."
(provide 'org-icalendar)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-icalendar.el ends here

7
lisp/org-id.el
View File

@ -233,7 +233,6 @@ With optional argument FORCE, force the creation of a new ID."
(org-entry-put (point) "ID" nil))
(org-id-get (point) 'create))
;;;###autoload
(defun org-id-copy ()
"Copy the ID of the entry at point to the kill ring.
Create an ID if necessary."
@ -259,7 +258,6 @@ In any case, the ID of the entry is returned."
(org-id-add-location id (buffer-file-name (buffer-base-buffer)))
id)))))
;;;###autoload
(defun org-id-get-with-outline-path-completion (&optional targets)
"Use outline-path-completion to retrieve the ID of an entry.
TARGETS may be a setting for `org-refile-targets' to define the eligible
@ -276,7 +274,6 @@ It returns the ID of the entry. If necessary, the ID is created."
(prog1 (org-id-get pom 'create)
(move-marker pom nil))))
;;;###autoload
(defun org-id-get-with-outline-drilling (&optional targets)
"Use an outline-cycling interface to retrieve the ID of an entry.
This only finds entries in the current buffer, using `org-get-location'.
@ -681,4 +678,8 @@ optional argument MARKERP, return the position as a new marker."
(provide 'org-id)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-id.el ends here

4
lisp/org-indent.el
View File

@ -431,4 +431,8 @@ This function is meant to be called by `after-change-functions'."
(provide 'org-indent)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-indent.el ends here

4
lisp/org-irc.el
View File

@ -252,4 +252,8 @@ default."
(provide 'org-irc)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-irc.el ends here

4
lisp/org-latex.el
View File

@ -2899,4 +2899,8 @@ The conversion is made depending of STRING-BEFORE and STRING-AFTER."
(provide 'org-export-latex)
(provide 'org-latex)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-latex.el ends here

9
lisp/org-lparse.el
View File

@ -50,7 +50,6 @@
(require 'org-list)
(require 'format-spec)
;;;###autoload
(defun org-lparse-and-open (target-backend native-backend arg
&optional file-or-buf)
"Export outline to TARGET-BACKEND via NATIVE-BACKEND and open exported file.
@ -71,7 +70,6 @@ lists."
(when org-export-kill-product-buffer-when-displayed
(kill-buffer (current-buffer))))))
;;;###autoload
(defun org-lparse-batch (target-backend &optional native-backend)
"Call the function `org-lparse'.
This function can be used in batch processing as:
@ -83,7 +81,6 @@ emacs --batch
(org-lparse target-backend native-backend
org-export-headline-levels 'hidden))
;;;###autoload
(defun org-lparse-to-buffer (backend arg)
"Call `org-lparse' with output to a temporary buffer.
No file is created. The prefix ARG is passed through to
@ -93,7 +90,6 @@ No file is created. The prefix ARG is passed through to
(when org-export-show-temporary-export-buffer
(switch-to-buffer-other-window tempbuf))))
;;;###autoload
(defun org-replace-region-by (backend beg end)
"Assume the current region has org-mode syntax, and convert it to HTML.
This can be used in any buffer. For example, you could write an
@ -115,7 +111,6 @@ this command to convert it."
(delete-region beg end)
(insert backend-string)))
;;;###autoload
(defun org-lparse-region (backend beg end &optional body-only buffer)
"Convert region from BEG to END in org-mode buffer to HTML.
If prefix arg BODY-ONLY is set, omit file header, footer, and table of
@ -2298,4 +2293,8 @@ Replaces invalid characters with \"_\"."
(provide 'org-lparse)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-lparse.el ends here

5
lisp/org-mobile.el
View File

@ -680,7 +680,6 @@ The table of checksums is written to the file mobile-checksums."
(let ((table '(?: ?/)))
(org-link-escape s table)))
;;;###autoload
(defun org-mobile-create-sumo-agenda ()
"Create a file that contains all custom agenda views."
(interactive)
@ -1129,4 +1128,8 @@ A and B must be strings or nil."
(provide 'org-mobile)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-mobile.el ends here

4
lisp/org-odt.el
View File

@ -2847,4 +2847,8 @@ formula file."
(provide 'org-odt)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-odt.el ends here

4
lisp/org-plot.el
View File

@ -351,4 +351,8 @@ line directly before or after the table."
(provide 'org-plot)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-plot.el ends here

5
lisp/org-publish.el
View File

@ -922,7 +922,6 @@ directory and force publishing all files."
(if force nil org-publish-use-timestamps-flag)))
(org-publish-projects org-publish-project-alist))))
;;;###autoload
(defun org-publish-current-file (&optional force)
"Publish the current file.
@ -1198,4 +1197,8 @@ Returns value on success, else nil."
(provide 'org-publish)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-publish.el ends here

4
lisp/org-remember.el
View File

@ -1149,4 +1149,8 @@ See also the variable `org-reverse-note-order'."
(provide 'org-remember)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-remember.el ends here

69
lisp/org-table.el
View File

@ -423,6 +423,7 @@ available parameters."
(concat "\\(" "@[-0-9I$]+" "\\|" "[a-zA-Z]\\{1,2\\}\\([0-9]+\\|&\\)" "\\)")
"Match a reference that needs translation, for reference display.")
;;;###autoload
(defun org-table-create-with-table.el ()
"Use the table.el package to insert a new table.
If there is already a table at point, convert between Org-mode tables
@ -439,6 +440,7 @@ and table.el tables."
(org-table-convert)))
(t (call-interactively 'table-insert))))
;;;###autoload
(defun org-table-create-or-convert-from-region (arg)
"Convert region to table, or create an empty table.
If there is an active region, convert it to a table, using the function
@ -451,6 +453,7 @@ If there is no such region, create an empty table with `org-table-create'."
(org-table-convert-region (region-beginning) (region-end) arg)
(org-table-create arg)))
;;;###autoload
(defun org-table-create (&optional size)
"Query for a size and insert a table skeleton.
SIZE is a string Columns x Rows like for example \"3x2\"."
@ -483,6 +486,7 @@ SIZE is a string Columns x Rows like for example \"3x2\"."
(goto-char pos)))
(org-table-align)))
;;;###autoload
(defun org-table-convert-region (beg0 end0 &optional separator)
"Convert region to a table.
The region goes from BEG0 to END0, but these borders will be moved
@ -543,6 +547,7 @@ nil When nil, the command tries to be smart and figure out the
(goto-char beg)
(org-table-align)))
;;;###autoload
(defun org-table-import (file arg)
"Import FILE as a table.
The file is assumed to be tab-separated. Such files can be produced by most
@ -558,6 +563,7 @@ are found, lines will be split on whitespace into fields."
(defvar org-table-last-alignment)
(defvar org-table-last-column-widths)
;;;###autoload
(defun org-table-export (&optional file format)
"Export table to a file, with configurable format.
Such a file can be imported into usual spreadsheet programs.
@ -673,6 +679,7 @@ When nil, simply write \"#ERROR\" in corrupted fields.")
(defconst org-narrow-column-arrow "=>"
"Used as display property in narrowed table columns.")
;;;###autoload
(defun org-table-align ()
"Align the table at point by aligning all vertical bars."
(interactive)
@ -884,6 +891,7 @@ With argument TABLE-TYPE, go to the end of a table.el-type table."
(goto-char (match-beginning 0)))
(point-marker)))
;;;###autoload
(defun org-table-justify-field-maybe (&optional new)
"Justify the current field, text to left, number to right.
Optional argument NEW may specify text to replace the current field content."
@ -924,6 +932,7 @@ Optional argument NEW may specify text to replace the current field content."
(setq org-table-may-need-update t))
(goto-char pos))))))
;;;###autoload
(defun org-table-next-field ()
"Go to the next field in the current table, creating new lines as needed.
Before doing so, re-align the table if necessary."
@ -953,6 +962,7 @@ Before doing so, re-align the table if necessary."
(error
(org-table-insert-row 'below)))))
;;;###autoload
(defun org-table-previous-field ()
"Go to the previous field in the table.
Before doing so, re-align the table if necessary."
@ -1006,6 +1016,7 @@ With numeric argument N, move N-1 fields backward first."
(forward-char 1)))
(if (<= (point) pos) (org-table-end-of-field 2))))
;;;###autoload
(defun org-table-next-row ()
"Go to the next row (same column) in the current table.
Before doing so, re-align the table if necessary."
@ -1029,6 +1040,7 @@ Before doing so, re-align the table if necessary."
(skip-chars-backward "^|\n\r")
(if (looking-at " ") (forward-char 1)))))
;;;###autoload
(defun org-table-copy-down (n)
"Copy a field down in the current column.
If the field at the cursor is empty, copy into it the content of
@ -1173,6 +1185,7 @@ is always the old value."
val)
(forward-char 1) ""))
;;;###autoload
(defun org-table-field-info (arg)
"Show info about the current field, and highlight any reference at point."
(interactive "P")
@ -1228,6 +1241,7 @@ is always the old value."
(message "In table column %d" cnt))
cnt)))
;;;###autoload
(defun org-table-current-dline ()
"Find out what table data line we are in.
Only data lines count for this."
@ -1244,6 +1258,7 @@ Only data lines count for this."
(message "This is table line %d" cnt))
cnt)))
;;;###autoload
(defun org-table-goto-column (n &optional on-delim force)
"Move the cursor to the Nth column in the current table line.
With optional argument ON-DELIM, stop with point before the left delimiter
@ -1266,6 +1281,7 @@ However, when FORCE is non-nil, create new columns if necessary."
(backward-char 1)
(if (looking-at " ") (forward-char 1)))))
;;;###autoload
(defun org-table-insert-column ()
"Insert a new column into the table."
(interactive)
@ -1335,6 +1351,7 @@ first dline below it is used. When ABOVE is non-nil, the one above is used."
(setq i (1+ i)))))
nil))
;;;###autoload
(defun org-table-delete-column ()
"Delete a column from the table."
(interactive)
@ -1367,15 +1384,18 @@ first dline below it is used. When ABOVE is non-nil, the one above is used."
(org-table-fix-formulas "$LR" (list (cons (number-to-string col) "INVALID"))
col -1 col))))
;;;###autoload
(defun org-table-move-column-right ()
"Move column to the right."
(interactive)
(org-table-move-column nil))
;;;###autoload
(defun org-table-move-column-left ()
"Move column to the left."
(interactive)
(org-table-move-column 'left))
;;;###autoload
(defun org-table-move-column (&optional left)
"Move the current column to the right. With arg LEFT, move to the left."
(interactive "P")
@ -1415,15 +1435,18 @@ first dline below it is used. When ABOVE is non-nil, the one above is used."
"$LR" (list (cons (number-to-string col) (number-to-string colpos))
(cons (number-to-string colpos) (number-to-string col)))))))
;;;###autoload
(defun org-table-move-row-down ()
"Move table row down."
(interactive)
(org-table-move-row nil))
;;;###autoload
(defun org-table-move-row-up ()
"Move table row up."
(interactive)
(org-table-move-row 'up))
;;;###autoload
(defun org-table-move-row (&optional up)
"Move the current table line down. With arg UP, move it up."
(interactive "P")
@ -1457,6 +1480,7 @@ first dline below it is used. When ABOVE is non-nil, the one above is used."
"@" (list (cons (number-to-string dline1) (number-to-string dline2))
(cons (number-to-string dline2) (number-to-string dline1)))))))
;;;###autoload
(defun org-table-insert-row (&optional arg)
"Insert a new row above the current line into the table.
With prefix ARG, insert below the current line."
@ -1478,6 +1502,7 @@ With prefix ARG, insert below the current line."
(funcall org-table-fix-formulas-confirm "Fix formulas? "))
(org-table-fix-formulas "@" nil (1- (org-table-current-dline)) 1))))
;;;###autoload
(defun org-table-insert-hline (&optional above)
"Insert a horizontal-line below the current line into the table.
With prefix ABOVE, insert above the current line."
@ -1501,6 +1526,7 @@ With prefix ABOVE, insert above the current line."
(org-move-to-column col)
(and org-table-overlay-coordinates (org-table-align))))
;;;###autoload
(defun org-table-hline-and-move (&optional same-column)
"Insert a hline and move to the row below that line."
(interactive "P")
@ -1527,6 +1553,7 @@ In particular, this does handle wide and invisible characters."
t t s)))
s))
;;;###autoload
(defun org-table-kill-row ()
"Delete the current row or horizontal line from the table."
(interactive)
@ -1542,6 +1569,7 @@ In particular, this does handle wide and invisible characters."
(org-table-fix-formulas "@" (list (cons (number-to-string dline) "INVALID"))
dline -1 dline))))
;;;###autoload
(defun org-table-sort-lines (with-case &optional sorting-type)
"Sort table lines according to the column at point.
@ -1622,7 +1650,7 @@ should be done in reverse order."
(org-table-goto-column thiscol)
(message "%d lines sorted, based on column %d" (length lns) column)))
;;;###autoload
(defun org-table-cut-region (beg end)
"Copy region in table to the clipboard and blank all relevant fields.
If there is no active region, use just the field at point."
@ -1631,6 +1659,7 @@ If there is no active region, use just the field at point."
(if (org-region-active-p) (region-end) (point))))
(org-table-copy-region beg end 'cut))
;;;###autoload
(defun org-table-copy-region (beg end &optional cut)
"Copy rectangular region in table to clipboard.
A special clipboard is used which can only be accessed
@ -1668,6 +1697,7 @@ with `org-table-paste-rectangle'."
(if cut (org-table-align))
org-table-clip))
;;;###autoload
(defun org-table-paste-rectangle ()
"Paste a rectangular region into a table.
The upper right corner ends up in the current field. All involved fields
@ -1698,6 +1728,7 @@ lines."
(org-table-goto-column col)
(org-table-align)))
;;;###autoload
(defun org-table-convert ()
"Convert from `org-mode' table to table.el and back.
Obviously, this only works within limits. When an Org-mode table is
@ -1771,6 +1802,7 @@ Note that horizontal lines disappeared."
contents ""))
(org-table-align)))
;;;###autoload
(defun org-table-wrap-region (arg)
"Wrap several fields in a column like a paragraph.
This is useful if you'd like to spread the contents of a field over several
@ -1841,6 +1873,7 @@ blank, and the content is appended to the field above."
(defvar org-field-marker nil)
;;;###autoload
(defun org-table-edit-field (arg)
"Edit table field in a different window.
This is mainly useful for fields that contain hidden parts.
@ -1944,6 +1977,7 @@ table (but see `org-table-exit-follow-field-mode-when-leaving-table')."
(defvar org-timecnt) ; dynamically scoped parameter
;;;###autoload
(defun org-table-sum (&optional beg end nlast)
"Sum numbers in region of current table column.
The result will be displayed in the echo area, and will be available
@ -2144,9 +2178,10 @@ When NAMED is non-nil, look for a named equation."
(bs (org-table-formula-make-cmp-string (car b))))
(and as bs (string< as bs))))
;;;###autoload
(defun org-table-get-stored-formulas (&optional noerror)
"Return an alist with the stored formulas directly after current table."
(interactive)
(interactive) ;; FIXME interactive?
(let ((case-fold-search t) scol eq eq-alist strings string seen)
(save-excursion
(goto-char (org-table-end))
@ -2283,6 +2318,7 @@ For all numbers larger than LIMIT, shift them by DELTA."
(setq org-table-local-parameters
(append org-table-local-parameters al2))))))
;;;###autoload
(defun org-table-maybe-eval-formula ()
"Check if the current field starts with \"=\" or \":=\".
If yes, store the formula and apply it."
@ -2313,6 +2349,7 @@ Will be filled automatically during use.")
("_" . "Names for values in row below this one.")
("^" . "Names for values in row above this one.")))
;;;###autoload
(defun org-table-rotate-recalc-marks (&optional newchar)
"Rotate the recalculation mark in the first column.
If in any row, the first field is not consistent with a mark,
@ -2374,6 +2411,7 @@ of the new mark."
(and (org-called-interactively-p 'interactive)
(message "%s" (cdr (assoc new org-recalc-marks))))))
;;;###autoload
(defun org-table-maybe-recalculate-line ()
"Recompute the current line if marked for it, and if we haven't just done it."
(interactive)
@ -2397,6 +2435,7 @@ of the new mark."
(cons var (cons value org-tbl-calc-modes)))
org-tbl-calc-modes)
;;;###autoload
(defun org-table-eval-formula (&optional arg equation
suppress-align suppress-const
suppress-store suppress-analysis)
@ -2823,6 +2862,7 @@ LISPP means to return something appropriate for a Lisp list."
elements
",") "]"))))
;;;###autoload
(defun org-table-recalculate (&optional all noalign)
"Recalculate the current table line by applying all stored formulas.
With prefix arg ALL, do this for all lines in the table.
@ -2961,6 +3001,7 @@ known that the table will be realigned a little later anyway."
(or noalign (and org-table-may-need-update (org-table-align))
(and all (message "Re-applying formulas...done"))))))
;;;###autoload
(defun org-table-iterate (&optional arg)
"Recalculate the table until it does not change anymore.
The maximum number of iterations is 10, but you can choose a different value
@ -2997,10 +3038,9 @@ with the prefix ARG."
"Iterate all tables in the buffer, to converge inter-table dependencies."
(interactive)
(let* ((imax 10)
(i imax)
(checksum (md5 (buffer-string)))
c1
(i imax))
c1)
(save-excursion
(save-restriction
(widen)
@ -3164,6 +3204,7 @@ Parameters get priority."
(defvar org-pos)
;;;###autoload
(defun org-table-edit-formulas ()
"Edit the formulas of the current table in a separate buffer."
(interactive)
@ -3801,6 +3842,7 @@ Use COMMAND to do the motion, repeat if necessary to end up in a data line."
(org-overlay-display ov str 'org-special-keyword 'evaporate)))
(beginning-of-line 2)))))
;;;###autoload
(defun org-table-toggle-coordinate-overlays ()
"Toggle the display of Row/Column numbers in tables."
(interactive)
@ -3813,6 +3855,7 @@ Use COMMAND to do the motion, repeat if necessary to end up in a data line."
(mapc 'delete-overlay org-table-coordinate-overlays)
(setq org-table-coordinate-overlays nil)))
;;;###autoload
(defun org-table-toggle-formula-debugger ()
"Toggle the formula debugger in tables."
(interactive)
@ -3852,11 +3895,6 @@ Use COMMAND to do the motion, repeat if necessary to end up in a data line."
(defvar orgtbl-mode-map (make-keymap)
"Keymap for `orgtbl-mode'.")
;;;###autoload
(defun turn-on-orgtbl ()
"Unconditionally turn on `orgtbl-mode'."
(orgtbl-mode 1))
(defvar org-old-auto-fill-inhibit-regexp nil
"Local variable used by `orgtbl-mode'.")
@ -4480,6 +4518,7 @@ First element has index 0, or I0 if given."
(*orgtbl-lfmt* *orgtbl-llfmt*))
(orgtbl-format-line prevline))))))
;;;###autoload
(defun orgtbl-to-generic (table params)
"Convert the orgtbl-mode TABLE to some other format.
This generic routine can be used for many standard cases.
@ -4606,9 +4645,11 @@ directly by `orgtbl-send-table'. See manual."
(remq nil *orgtbl-rtn*)
*orgtbl-rtn*)) "\n")))
;;;###autoload
(defun orgtbl-to-tsv (table params)
"Convert the orgtbl-mode table to TAB separated material."
(orgtbl-to-generic table (org-combine-plists '(:sep "\t") params)))
;;;###autoload
(defun orgtbl-to-csv (table params)
"Convert the orgtbl-mode table to CSV material.
This does take care of the proper quoting of fields with comma or quotes."
@ -4616,6 +4657,7 @@ This does take care of the proper quoting of fields with comma or quotes."
'(:sep "," :fmt org-quote-csv-field)
params)))
;;;###autoload
(defun orgtbl-to-latex (table params)
"Convert the orgtbl-mode TABLE to LaTeX.
TABLE is a list, each entry either the symbol `hline' for a horizontal
@ -4654,6 +4696,7 @@ this function is called."
:efmt "%s\\,(%s)" :hline "\\hline")))
(orgtbl-to-generic table (org-combine-plists params2 params))))
;;;###autoload
(defun orgtbl-to-html (table params)
"Convert the orgtbl-mode TABLE to HTML.
TABLE is a list, each entry either the symbol `hline' for a horizontal
@ -4684,6 +4727,7 @@ so you cannot specify parameters for it."
(setq html (replace-match "" t t html)))
html))
;;;###autoload
(defun orgtbl-to-texinfo (table params)
"Convert the orgtbl-mode TABLE to TeXInfo.
TABLE is a list, each entry either the symbol `hline' for a horizontal
@ -4722,6 +4766,7 @@ this function is called."
:hlstart "@headitem ")))
(orgtbl-to-generic table (org-combine-plists params2 params))))
;;;###autoload
(defun orgtbl-to-orgtbl (table params)
"Convert the orgtbl-mode TABLE into another orgtbl-mode table.
Useful when slicing one table into many. The :hline, :sep,
@ -4832,4 +4877,8 @@ list of the fields in the rectangle ."
(provide 'org-table)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-table.el ends here

4
lisp/org-taskjuggler.el
View File

@ -800,4 +800,8 @@ org-mode priority string."
(provide 'org-taskjuggler)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-taskjuggler.el ends here

6
lisp/org-timer.el
View File

@ -130,7 +130,6 @@ the region 0:00:00."
(org-timer-secs-to-hms (or delta 0)))
(run-hooks 'org-timer-start-hook))))
;;;###autoload
(defun org-timer-pause-or-continue (&optional stop)
"Pause or continue the relative timer.
With prefix arg STOP, stop it entirely."
@ -157,7 +156,6 @@ With prefix arg STOP, stop it entirely."
(org-timer-set-mode-line 'pause)
(message "Timer paused at %s" (org-timer-value-string)))))
;;;###autoload
(defun org-timer-stop ()
"Stop the relative timer."
(interactive)
@ -443,4 +441,8 @@ replace any running timer."
(provide 'org-timer)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-timer.el ends here

4
lisp/org-xoxo.el
View File

@ -122,4 +122,8 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
(provide 'org-xoxo)
;; Local variables:
;; generated-autoload-file: "org-loaddefs.el"
;; End:
;;; org-xoxo.el ends here

235
lisp/org.el
View File

@ -78,6 +78,8 @@
(require 'find-func)
(require 'format-spec)
(load "org-loaddefs.el" t t)
;; `org-outline-regexp' ought to be a defconst but is let-binding in
;; some places -- e.g. see the macro org-with-limited-levels.
;;
@ -118,8 +120,23 @@ Stars are put in group 1 and the trimmed body in group 2.")
(declare-function org-clock-timestamps-down "org-clock" ())
(declare-function org-clock-sum-current-item "org-clock" (&optional tstart))
(declare-function orgtbl-mode "org-table" (&optional arg))
(declare-function org-clock-out "org-clock" (&optional switch-to-state fail-quietly at-time))
(declare-function org-beamer-mode "org-beamer" ())
(declare-function org-table-edit-field "org-table" (arg))
(declare-function org-table-justify-field-maybe "org-table" (&optional new))
(declare-function org-id-get-create "org-id" (&optional force))
(declare-function org-id-find-id-file "org-id" (id))
(declare-function org-tags-view "org-agenda" (&optional todo-only match))
(declare-function org-agenda-list "org-agenda" (&optional arg start-day span))
(declare-function org-table-align "org-table" ())
(declare-function org-table-paste-rectangle "org-table" ())
(declare-function org-table-maybe-eval-formula "org-table" ())
(declare-function org-table-maybe-recalculate-line "org-table" ())
;; load languages based on value of `org-babel-load-languages'
(defvar org-babel-load-languages)
;;;###autoload
(defun org-babel-do-load-languages (sym value)
"Load the languages defined in `org-babel-load-languages'."
@ -207,6 +224,7 @@ identifier."
;;; Version
(require 'org-compat)
(org-check-version)
;;;###autoload
(defun org-version (&optional here full message)
"Show the org-mode version in the echo area.
@ -215,7 +233,7 @@ When FULL is non-nil, use a verbose version string.
When MESSAGE is non-nil, display a message with the version."
(interactive "P")
(let* ((org-dir (ignore-errors (org-find-library-dir "org")))
(org-install-dir (ignore-errors (org-find-library-dir "org-install.el")))
(org-install-dir (ignore-errors (org-find-library-dir "org-loaddefs.el")))
(org-trash (or
(and (fboundp 'org-release) (fboundp 'org-git-version))
(load (concat org-dir "org-version.el")
@ -229,7 +247,7 @@ When MESSAGE is non-nil, display a message with the version."
(if (string= org-dir org-install-dir)
org-install-dir
(concat "mixed installation! " org-install-dir " and " org-dir))
"org-install.el can not be found!")))
"org-loaddefs.el can not be found!")))
(_version (if full version org-version)))
(if (org-called-interactively-p 'interactive)
(if here
@ -3872,30 +3890,13 @@ This works for both table types.")
(eval-and-compile
(org-autoload "org-table"
'(org-table-align org-table-begin org-table-blank-field
org-table-convert org-table-convert-region org-table-copy-down
org-table-copy-region org-table-create
org-table-create-or-convert-from-region
org-table-create-with-table.el org-table-current-dline
org-table-cut-region org-table-delete-column org-table-edit-field
org-table-edit-formulas org-table-end org-table-eval-formula
org-table-export org-table-field-info
org-table-get-stored-formulas org-table-goto-column
org-table-hline-and-move org-table-import org-table-insert-column
org-table-insert-hline org-table-insert-row org-table-iterate
org-table-justify-field-maybe org-table-kill-row
org-table-maybe-eval-formula org-table-maybe-recalculate-line
org-table-move-column org-table-move-column-left
org-table-move-column-right org-table-move-row
org-table-move-row-down org-table-move-row-up
org-table-next-field org-table-next-row org-table-paste-rectangle
org-table-previous-field org-table-recalculate
org-table-rotate-recalc-marks org-table-sort-lines org-table-sum
org-table-toggle-coordinate-overlays
org-table-toggle-formula-debugger org-table-wrap-region
orgtbl-mode turn-on-orgtbl org-table-to-lisp
orgtbl-to-generic orgtbl-to-tsv orgtbl-to-csv orgtbl-to-latex
orgtbl-to-orgtbl orgtbl-to-html orgtbl-to-texinfo)))
'(org-table-begin org-table-blank-field org-table-end)))
;;;###autoload
(defun turn-on-orgtbl ()
"Unconditionally turn on `orgtbl-mode'."
(require 'org-table)
(orgtbl-mode 1))
(defun org-at-table-p (&optional table-type)
"Return t if the cursor is inside an org-type table.
@ -3974,62 +3975,14 @@ If TABLE-TYPE is non-nil, also check for table.el-type tables."
(declare-function org-default-export-plist "org-exp")
(declare-function org-infile-export-plist "org-exp")
(declare-function org-get-current-options "org-exp")
(eval-and-compile
(org-autoload "org-exp"
'(org-export org-export-visible
org-insert-export-options-template
org-table-clean-before-export))
(org-autoload "org-ascii"
'(org-export-as-ascii org-export-ascii-preprocess
org-export-as-ascii-to-buffer org-replace-region-by-ascii
org-export-region-as-ascii))
(org-autoload "org-latex"
'(org-export-as-latex-batch org-export-as-latex-to-buffer
org-replace-region-by-latex org-export-region-as-latex
org-export-as-latex org-export-as-pdf
org-export-as-pdf-and-open))
(org-autoload "org-html"
'(org-export-as-html-and-open
org-export-as-html-batch org-export-as-html-to-buffer
org-replace-region-by-html org-export-region-as-html
org-export-as-html))
(org-autoload "org-docbook"
'(org-export-as-docbook-batch org-export-as-docbook-to-buffer
org-replace-region-by-docbook org-export-region-as-docbook
org-export-as-docbook-pdf org-export-as-docbook-pdf-and-open
org-export-as-docbook))
(org-autoload "org-icalendar"
'(org-export-icalendar-this-file
org-export-icalendar-all-agenda-files
org-export-icalendar-combine-agenda-files))
(org-autoload "org-xoxo" '(org-export-as-xoxo))
(org-autoload "org-beamer" '(org-beamer-mode org-beamer-sectioning)))
;; Declare and autoload functions from org-agenda.el
(eval-and-compile
(org-autoload "org-agenda"
'(org-agenda org-agenda-list org-search-view
org-todo-list org-tags-view org-agenda-list-stuck-projects
org-diary org-agenda-to-appt
org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item)))
'(org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item)))
;; Autoload org-remember
(eval-and-compile
(org-autoload "org-remember"
'(org-remember-insinuate org-remember-annotation
org-remember-apply-template org-remember org-remember-handler)))
(eval-and-compile
(org-autoload "org-capture"
'(org-capture org-capture-insert-template-here
org-capture-import-remember-templates)))
;; Autoload org-clock.el
(declare-function org-clock-save-markers-for-cut-and-paste "org-clock"
(beg end))
(declare-function org-clock-save-markers-for-cut-and-paste "org-clock" (beg end))
(declare-function org-clock-update-mode-line "org-clock" ())
(declare-function org-resolve-clocks "org-clock"
(&optional also-non-dangling-p prompt last-valid))
@ -4046,55 +3999,9 @@ The return value is actually the clock marker."
(marker-buffer org-clock-marker))
(eval-and-compile
(org-autoload
"org-clock"
'(org-clock-in org-clock-out org-clock-cancel
org-clock-goto org-clock-sum org-clock-display
org-clock-remove-overlays org-clock-report
org-clocktable-shift org-dblock-write:clocktable
org-get-clocktable org-resolve-clocks)))
(defun org-clock-update-time-maybe ()
"If this is a CLOCK line, update it and return t.
Otherwise, return nil."
(interactive)
(save-excursion
(beginning-of-line 1)
(skip-chars-forward " \t")
(when (looking-at org-clock-string)
(let ((re (concat "[ \t]*" org-clock-string
" *[[<]\\([^]>]+\\)[]>]\\(-+[[<]\\([^]>]+\\)[]>]"
"\\([ \t]*=>.*\\)?\\)?"))
ts te h m s neg)
(cond
((not (looking-at re))
nil)
((not (match-end 2))
(when (and (equal (marker-buffer org-clock-marker) (current-buffer))
(> org-clock-marker (point))
(<= org-clock-marker (point-at-eol)))
;; The clock is running here
(setq org-clock-start-time
(apply 'encode-time
(org-parse-time-string (match-string 1))))
(org-clock-update-mode-line)))
(t
(and (match-end 4) (delete-region (match-beginning 4) (match-end 4)))
(end-of-line 1)
(setq ts (match-string 1)
te (match-string 3))
(setq s (- (org-float-time
(apply 'encode-time (org-parse-time-string te)))
(org-float-time
(apply 'encode-time (org-parse-time-string ts))))
neg (< s 0)
s (abs s)
h (floor (/ s 3600))
s (- s (* 3600 h))
m (floor (/ s 60))
s (- s (* 60 s)))
(insert " => " (format (if neg "-%d:%02d" "%2d:%02d") h m))
t))))))
(org-autoload "org-clock" '(org-clock-remove-overlays
org-clock-update-time-maybe
org-clocktable-shift)))
(defun org-check-running-clock ()
"Check if the current buffer contains the running clock.
@ -4111,44 +4018,18 @@ If yes, offer to stop it and to save the buffer with the changes."
(when (org-match-line "^[ \t]*#\\+BEGIN:[ \t]+clocktable\\>")
(org-clocktable-shift dir n)))
;; Autoload org-timer.el
(eval-and-compile
(org-autoload
"org-timer"
'(org-timer-start org-timer org-timer-item
org-timer-change-times-in-region
org-timer-set-timer
org-timer-reset-timers
org-timer-show-remaining-time)))
;; Autoload org-feed.el
(eval-and-compile
(org-autoload
"org-feed"
'(org-feed-update org-feed-update-all org-feed-goto-inbox)))
;; Autoload org-indent.el
;;;###autoload
(defun org-clock-persistence-insinuate ()
"Set up hooks for clock persistence."
(require 'org-clock)
(add-hook 'org-mode-hook 'org-clock-load)
(add-hook 'kill-emacs-hook 'org-clock-save))
;; Define the variable already here, to make sure we have it.
(defvar org-indent-mode nil
"Non-nil if Org-Indent mode is enabled.
Use the command `org-indent-mode' to change this variable.")
(eval-and-compile
(org-autoload
"org-indent"
'(org-indent-mode)))
;; Autoload org-mobile.el
(eval-and-compile
(org-autoload
"org-mobile"
'(org-mobile-push org-mobile-pull org-mobile-create-sumo-agenda)))
;; Autoload archiving code
;; The stuff that is needed for cycling and tags has to be defined here.
@ -4322,10 +4203,7 @@ Otherwise, these types are allowed:
(eval-and-compile
(org-autoload "org-archive"
'(org-add-archive-files org-archive-subtree
org-archive-to-archive-sibling org-toggle-archive-tag
org-archive-subtree-default
org-archive-subtree-default-with-confirmation)))
'(org-add-archive-files)))
;; Autoload Column View Code
@ -4334,9 +4212,10 @@ Otherwise, these types are allowed:
(declare-function org-columns-compute "org-colview" (property))
(org-autoload (if (featurep 'xemacs) "org-colview-xemacs" "org-colview")
'(org-columns-number-to-string org-columns-get-format-and-top-level
org-columns-compute org-agenda-columns org-columns-remove-overlays
org-columns org-insert-columns-dblock org-dblock-write:columnview))
'(org-columns-number-to-string
org-columns-get-format-and-top-level
org-columns-compute
org-columns-remove-overlays))
;; Autoload ID code
@ -4345,15 +4224,10 @@ Otherwise, these types are allowed:
(declare-function org-id-locations-save "org-id")
(defvar org-id-track-globally)
(org-autoload "org-id"
'(org-id-get-create org-id-new org-id-copy org-id-get
org-id-get-with-outline-path-completion
org-id-get-with-outline-drilling org-id-store-link
org-id-goto org-id-find org-id-store-link))
;; Autoload Plotting Code
(org-autoload "org-plot"
'(org-plot/gnuplot))
'(org-id-new
org-id-copy
org-id-get-with-outline-path-completion
org-id-get-with-outline-drilling))
;;; Variables for pre-computed regular expressions, all buffer local
@ -5102,7 +4976,7 @@ The following commands are available:
(lambda (&rest ignore) (org-show-context 'isearch))))
;; Turn on org-beamer-mode?
(and org-startup-with-beamer-mode (org-beamer-mode 1))
(and org-startup-with-beamer-mode (org-beamer-mode))
;; Setup the pcomplete hooks
(set (make-local-variable 'pcomplete-command-completion-function)
@ -11373,7 +11247,6 @@ Error if there is no such block at point."
(goto-char pos)
(error "Not in a dynamic block"))))
;;;###autoload
(defun org-update-all-dblocks ()
"Update all dynamic blocks in the buffer.
This function can be used in a hook."
@ -14194,7 +14067,6 @@ Returns the new tags string, or nil to not change the current settings."
;;;; The mapping API
;;;###autoload
(defun org-map-entries (func &optional match scope &rest skip)
"Call FUNC at each headline selected by MATCH in SCOPE.
@ -20105,7 +19977,6 @@ Your bug report will be posted to the Org-mode mailing list.
;;;; Documentation
;;;###autoload
(defun org-require-autoloaded-modules ()
(interactive)
(mapc 'require
@ -22182,7 +22053,6 @@ Stop at the first and last subheadings of a superior heading."
(if (< l level) (setq arg 1)))
(setq arg (1- arg)))))
;;;###autoload
(defun org-forward-element ()
"Move forward by one element.
Move to the next element at the same level, when possible."
@ -22202,7 +22072,6 @@ Move to the next element at the same level, when possible."
(goto-char (org-element-property :end parent))
(goto-char end))))))
;;;###autoload
(defun org-backward-element ()
"Move backward by one element.
Move to the previous element at the same level, when possible."
@ -22229,7 +22098,6 @@ Move to the previous element at the same level, when possible."
((org-before-first-heading-p) (goto-char (point-min)))
(t (org-back-to-heading)))))))
;;;###autoload
(defun org-up-element ()
"Move to upper element."
(interactive)
@ -22242,7 +22110,6 @@ Move to the previous element at the same level, when possible."
(error "No surrounding element")
(org-with-limited-levels (org-back-to-heading)))))))
;;;###autoload
(defvar org-element-greater-elements)
(defun org-down-element ()
"Move to inner element."
@ -22259,7 +22126,6 @@ Move to the previous element at the same level, when possible."
(error "No content for this element"))))
(t (error "No inner element")))))
;;;###autoload
(defun org-drag-element-backward ()
"Move backward element at point."
(interactive)
@ -22276,7 +22142,6 @@ Move to the previous element at the same level, when possible."
(goto-char (+ (org-element-property :begin prev-elem)
(- pos (org-element-property :begin elem)))))))))
;;;###autoload
(defun org-drag-element-forward ()
"Move forward element at point."
(interactive)
@ -22311,7 +22176,6 @@ Move to the previous element at the same level, when possible."
(org-element-swap-A-B elem next-elem)
(goto-char (+ pos size-next size-blank))))))
;;;###autoload
(defun org-mark-element ()
"Put point at beginning of this element, mark at end.
@ -22332,7 +22196,6 @@ ones already marked."
(push-mark (org-element-property :end element) t t)
(goto-char (org-element-property :begin element))))))
;;;###autoload
(defun org-narrow-to-element ()
"Narrow buffer to current element."
(interactive)
@ -22351,7 +22214,6 @@ ones already marked."
(org-element-property :begin elem)
(org-element-property :end elem))))))
;;;###autoload
(defun org-transpose-element ()
"Transpose current and previous elements, keeping blank lines between.
Point is moved after both elements."
@ -22361,7 +22223,6 @@ Point is moved after both elements."
(org-drag-element-backward)
(goto-char end)))
;;;###autoload
(defun org-unindent-buffer ()
"Un-indent the visible part of the buffer.
Relative indentation (between items, inside blocks, etc.) isn't

6
mk/default.mk
View File

@ -56,7 +56,7 @@ BTEST = $(BATCH) \
--eval '(add-to-list '"'"'load-path "./lisp")' \
--eval '(add-to-list '"'"'load-path "./testing")' \
$(BTEST_POST) \
-l org-install.el \
-l org-loaddefs.el \
-l testing/org-test.el \
$(foreach ob-lang,$(BTEST_OB_LANGUAGES),$(req-ob-lang)) \
$(foreach req,$(BTEST_EXTRA),$(req-extra)) \
@ -81,11 +81,11 @@ MAKE_LOCAL_MK = $(BATCHO) \
BATCHL = $(BATCH) \
--eval '(add-to-list '"'"'load-path ".")'
# How to generate org-install.el
# How to generate org-loaddefs.el
MAKE_ORG_INSTALL = $(BATCHL) \
--eval '(load "org-compat.el")' \
--eval '(load "../mk/org-fixup.el")' \
--eval '(org-make-org-install)'
--eval '(org-make-org-loaddefs)'
# How to generate org-version.el
MAKE_ORG_VERSION = $(BATCHL) \

16
mk/org-fixup.el
View File

@ -61,26 +61,26 @@ the Git work tree)."
(toggle-read-only 0)
(write-file "org-version.el")))
(defun org-make-org-install ()
"Make the file org-install.el in the current directory.
(defun org-make-org-loaddefs ()
"Make the file org-loaddefs.el in the current directory.
This function is internally used by the build system and should
be used by foreign build systems or installers to produce this
file in the installation directory of org-mode. Org will not
work correctly if this file is not up-to-date."
(with-temp-buffer
(set-visited-file-name "org-install.el")
(insert ";;; org-install.el --- autogenerated file, do not edit\n;;\n;;; Code:\n")
(set-visited-file-name "org-loaddefs.el")
(insert ";;; org-loaddefs.el --- autogenerated file, do not edit\n;;\n;;; Code:\n")
(let ((files (directory-files default-directory nil "^\\(org\\|ob\\)\\(-.*\\)?\\.el$")))
(mapc (lambda (f) (generate-file-autoloads f)) files))
(insert "\f\n(provide 'org-install)\n")
(insert "\f\n(provide 'org-loaddefs)\n")
(insert "\f\n;; Local Variables:\n;; version-control: never\n")
(insert ";; no-byte-compile: t\n;; no-update-autoloads: t\n")
(insert ";; coding: utf-8\n;; End:\n;;; org-install.el ends here\n")
(insert ";; coding: utf-8\n;; End:\n;;; org-loaddefs.el ends here\n")
(toggle-read-only 0)
(save-buffer)))
(defun org-make-autoloads (&optional compile force)
"Make the files org-install and org-version.el in the install directory.
"Make the files org-loaddefs.el and org-version.el in the install directory.
Finds the install directory by looking for library \"org\".
Optionally byte-compile lisp files in the install directory or
force re-compilation. This function is provided for easier
@ -96,7 +96,7 @@ manual install when the build system can't be used."
(cd dirlisp)
(org-fixup)
(org-make-org-version (org-release) (org-git-version) dirodt)
(org-make-org-install)
(org-make-org-loaddefs)
(when compile (byte-recompile-directory dirlisp 0 force)))
(cd origin))))