Bastien Guerry
6d48cbc944
Revert "Compatibility: Use org-define-obsolete-{function,variable}-alias"
...
This reverts commit 8fcdb5179b
.
2013-01-14 09:34:07 +01:00
Bastien Guerry
6b746e20b8
Merge branch 'master' of orgmode.org:org-mode
2013-01-13 11:18:00 +01:00
Bastien Guerry
7369cada30
Merge branch 'maint'
2013-01-13 11:17:56 +01:00
Nicolas Goaziou
9d26797448
Move functions operating on timestamp objects into org.el
...
* contrib/lisp/org-export.el (org-export-timestamp-has-time-p,
org-export-format-timestamp, org-export-split-timestamp-range,
org-export-translate-timestamp): Removed functions.
* lisp/org.el (org-timestamp-has-time-p, org-timestamp-format,
org-timestamp-split-range, org-timestamp-translate): New functions.
* contrib/lisp/org-e-ascii.el (org-e-ascii-timestamp): Apply move.
* contrib/lisp/org-e-groff.el (org-e-groff-timestamp): Apply move.
* contrib/lisp/org-e-html.el (org-e-html-timestamp): Apply move.
* contrib/lisp/org-e-latex.el (org-e-latex-timestamp): Apply move.
* contrib/lisp/org-e-odt.el (org-e-odt--format-timestamp,
org-e-odt-timestamp): Apply move.
* contrib/lisp/org-e-texinfo.el (org-e-texinfo-timestamp): Apply move.
* testing/lisp/test-org-export.el: Remove tests.
* testing/lisp/test-org.el: Add tests.
2013-01-13 10:01:05 +01:00
Bastien Guerry
e8f5b0ad72
Delete `org-condition-case-unless-debug'
...
* org-compat.el (org-condition-case-unless-debug): Delete.
* org-odt.el (org-odt-cleanup-xml-buffers): Use
`condition-case' instead of `org-condition-case-unless-debug',
which is now deleted.
2013-01-13 09:27:08 +01:00
Bastien Guerry
3a5a4ddd41
Revert "Backwards compatibility: don't defalias special forms"
...
This reverts commit b63275350f
.
2013-01-13 09:24:43 +01:00
Bastien Guerry
04eb4b08c3
Revert "Compatibility: Use org-define-obsolete-{function,variable}-alias"
...
This reverts commit 305f29776f
.
2013-01-13 09:19:24 +01:00
Achim Gratz
409ee8a2f2
Compatibility: XEmacs does not have user-emacs-directory, use user-init-directory instead
...
* lisp/org-compat.el (user-emacs-directory): If not bound, define as an alias to
`user-init-directory´ so that XEmacs continues to be happy with Org.
2013-01-12 18:24:18 +01:00
Bastien Guerry
4b1fcd04e8
Merge branch 'maint'
2013-01-12 15:44:01 +01:00
Bastien Guerry
d815f025e9
* org-mobile.el (org-mobile-write-agenda-for-mobile): Fix bug
...
when replacing the heading.
Thanks to Jeff Myer for reporting this.
2013-01-12 15:43:53 +01:00
Bastien Guerry
09f108ec57
Merge branch 'maint'
2013-01-12 09:20:22 +01:00
Bastien Guerry
a0ad34b8d4
Docstring fixes.
...
* org-capture.el (org-capture-templates-contexts):
* org-agenda.el (org-agenda-custom-commands-contexts):
Docstring fix.
2013-01-12 09:20:17 +01:00
Yasushi SHOJI
0499f0a939
org-clock.el: New option `org-clock-x11idle-program-name'
...
* org-clock.el (org-clock-x11idle-program-name): New option.
(org-x11idle-exists-p, org-x11-idle-seconds): Use it.
* org.texi (Resolving idle time): Document
`org-clock-x11idle-program-name'.
Debian and other OSes already have a program called 'xprintidle',
which does the same thing as x11idle. It also handles the DPMS bug[1]
some version of X servers have.
In order to use an alternative, introduce a customizable variable
'org-clock-x11idle-program-name' to hold the actual command name.
[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502226
2013-01-11 23:16:45 +01:00
Bastien Guerry
71f2befb61
Merge branch 'maint'
...
Conflicts:
lisp/org-agenda.el
2013-01-11 17:19:52 +01:00
Bastien Guerry
3c4df588e8
Restore previous behavior for inherited tags, now just more flexible
...
* org.el (org-get-tags-at): Remove duplicate inherited tags.
* org-agenda.el (org-agenda-show-inherited-tags): Allow to be
set to 'always or to a list of agenda types.
(org-agenda-finalize): Rework conditions under which inherited
tags should be made available even when not displayed.
(org-search-view, org-agenda-get-todos)
(org-agenda-get-timestamps, org-agenda-get-sexps)
(org-agenda-get-progress, org-agenda-get-scheduled)
(org-agenda-get-blocks): Use new possible values of
`org-agenda-show-inherited-tags'.
Thanks to Karl Voit and Tassilo Horn who first reported this.
2013-01-11 17:15:17 +01:00
Bastien Guerry
69133332aa
Merge branch 'maint'
2013-01-11 12:31:51 +01:00
Bastien Guerry
db7ece9fa2
org.el ("org-loaddefs.el"): use load', not
org-load-noerror-mustsuffix'
...
* org.el ("org-loaddefs.el"): Load org-loaddefs.el before
requiring any org library. Also use `load', not
`org-load-noerror-mustsuffix'.
(org-effort-durations): Move up to fix a compiler warning.
This patch should reduce complexity without breaking compatibility
with XEmacs. Before this patch, users with a wrong load path would
require org-compat.el from this wrong load path, and loading
org-loaddefs.el would not work.
2013-01-11 12:31:40 +01:00
Bastien Guerry
de10210cf9
org.el (org-open-at-point): Fix opening all links at point
...
* org.el (org-open-at-point): Fix opening all links at point.
Thanks to Ingo Lohmar for reporting this.
2013-01-11 12:11:09 +01:00
Eric Schulte
f94d81a17e
`org-load-noerror-mustsuffix' requires an autoload
...
* lisp/org-macs.el: `org-load-noerror-mustsuffix' requires an autoload.
2013-01-10 16:43:26 -07:00
Bastien Guerry
535750d705
Merge branch 'master' of orgmode.org:org-mode
2013-01-10 14:37:58 +01:00
Nicolas Goaziou
b68103a344
org-element: Correctly interpret timestamps ranges with repeaters
...
* lisp/org-element.el (org-element-timestamp-interpreter): Interpret
timestamps ranges with repeaters.
* testing/lisp/test-org-element.el: Add test.
2013-01-10 14:02:19 +01:00
Bastien Guerry
67e83a10c8
Merge branch 'maint'
2013-01-10 12:15:37 +01:00
Bastien Guerry
8b0fe31386
org-agenda.el (org-get-entries-from-diary): Turn off `diary-file-name-prefix'
...
* org-agenda.el (org-get-entries-from-diary): Turn off
`diary-file-name-prefix' instead of
`diary-file-name-prefix-function', the former is checked
before the latter.
Thanks to Andreas Merziger for reporting this as Emacs bug#13396.
2013-01-10 12:15:24 +01:00
Nicolas Richard
da0276cba5
* org-attach.el (org-attach-reveal, org-attach-reveal-in-emacs): Fix the docstrings.
2013-01-09 18:01:54 +01:00
Nicolas Richard
f82004840a
* org-id.el (org-id-locations-file):
...
* org-clock.el (org-clock-persist-file): Fix hardcoded
reference to "~/.emacs.d".
* contrib/lisp/org-track.el (org-track-directory): Fix hardcoded
reference to "~/.emacs.d".
2013-01-09 17:59:17 +01:00
Bastien Guerry
d1d7da4267
org.el (org-edit-special): Fix typo in docstring
...
* org.el (org-edit-special): Fix typo in docstring.
2013-01-09 17:57:06 +01:00
Nicolas Goaziou
3ea93df5a6
Rewrite `org-edit-special' with Elements
...
* lisp/org.el (org-edit-special): Rewrite `org-edit-special' using Org
Elements tools. Behaviour should be unchanged.
2013-01-09 15:41:41 +01:00
Nicolas Goaziou
2fd88bfd56
org-element: Small optimization to `org-element-context'
...
* lisp/org-element.el (org-element-context): Add an optional argument
so (org-element-context)
and (org-element-context (org-element-at-point)) are equivalent.
* testing/lisp/test-org-element.el: Add test.
2013-01-09 15:33:29 +01:00
Bastien Guerry
1dd1b10d5a
Merge branch 'maint'
2013-01-09 14:11:12 +01:00
Michael Albinus
79dd795fe4
ob-eval.el (org-babel-shell-command-on-region): Use executable-find' for local
shell-file-name'
...
* ob-eval.el (org-babel-shell-command-on-region): Use
`executable-find' for local `shell-file-name'.
2013-01-09 14:11:08 +01:00
Bastien Guerry
94ea6bca08
Merge branch 'maint'
2013-01-08 23:44:59 +01:00
Bastien Guerry
e53f22c615
org.el (org-edit-special): Check for table.el before checking for Org tables
...
* org.el (org-edit-special): Check for table.el before
checking for Org tables.
Thanks to Jacobo de Vera for reporting this.
2013-01-08 23:44:54 +01:00
Bastien Guerry
bb15139ab7
Merge branch 'maint'
2013-01-08 18:40:01 +01:00
Bastien Guerry
4cac751536
org-agenda.el (org-agenda-finalize): Inhibit readonly for the whole function
...
* org-agenda.el (org-agenda-finalize): Inhibit readonly for
the whole function.
Thanks to J. David Boyd for hitting this bug and reporting it.
2013-01-08 18:39:45 +01:00
Bastien Guerry
7330e2a8a4
Merge branch 'maint'
2013-01-08 18:33:09 +01:00
Bastien Guerry
a5815f3f5b
org-src.el (org-edit-src-find-region-and-lang): Try to find table.el tables first
...
* org-src.el (org-edit-src-find-region-and-lang): Try to find
table.el tables first.
Thanks to Jacobo de Vera for insisting on this.
2013-01-08 18:26:06 +01:00
Bastien Guerry
b4ff6d9727
Merge branch 'maint'
2013-01-08 16:34:38 +01:00
Bastien Guerry
afc7b7bf4b
org-jsinfo.el (org-infojs-template): Fix copyright years
...
* org-jsinfo.el (org-infojs-template): Fix copyright years.
2013-01-08 16:34:31 +01:00
Bastien Guerry
f5e478a401
Merge branch 'maint'
2013-01-08 15:57:17 +01:00
Bastien Guerry
a4b4143132
org-src.el (org-edit-src-code): Fix bug when trying to edit a table.el table
...
* org-src.el (org-edit-src-code): Fix bug when trying to edit
a table.el table.
Thanks to Jacobo de Vera for reporting this regression.
2013-01-08 15:57:10 +01:00
Bastien Guerry
679dce0fda
Merge branch 'maint'
2013-01-08 15:26:17 +01:00
Bastien Guerry
31c1aeabae
Various small fixes
2013-01-08 15:26:04 +01:00
Bastien Guerry
5fc740a230
Merge branch 'maint'
2013-01-08 15:04:40 +01:00
Bastien Guerry
72bc144c15
Update Copyright lines to match Emacs format.
2013-01-08 15:04:32 +01:00
Bastien Guerry
1e38a8162c
Merge branch 'maint'
2013-01-08 14:30:44 +01:00
Bastien Guerry
05f5f726fb
org-agenda (org-agenda-finalize): Don't remove tag alignment
...
* org-agenda.el (org-agenda-finalize): Don't remove tag
alignment depending on `org-prefix-has-tag', this should
depend on `org-agenda-remove-tags'.
Thanks to Rainer Stengele for reporting this.
2013-01-08 14:29:29 +01:00
Bastien Guerry
7a186dc005
Merge branch 'maint'
2013-01-08 11:34:18 +01:00
Bastien Guerry
93b0cf60e7
org-agenda.el (org-agenda-finalize): Downcase tags when readding them after agenda generation
...
* org-agenda.el (org-agenda-finalize): Downcase tags when
readding them after agenda generation.
2013-01-08 11:34:09 +01:00
Nicolas Goaziou
d9649ca7a2
Merge branch 'maint'
2013-01-08 10:36:47 +01:00
Nicolas Goaziou
7684fbd6a2
Ignore `auto-fill-inhibit-regexp'
...
* lisp/org.el (org-setup-filling): Ignore `auto-fill-inhibit-regexp'.
The idea behind this is that `org-adaptive-fill-function' already
determines which lines should be filled.
2013-01-08 10:34:40 +01:00