67e83a10c8
Merge branch 'maint'
2013-01-10 12:15:37 +01:00
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
f8f5489071
mention elisp as special rowname case.
...
* doc/org.texi (rownames): Mention elisp as special rowname case.
2013-01-09 10:22:13 -07:00
da0276cba5
* org-attach.el (org-attach-reveal, org-attach-reveal-in-emacs): Fix the docstrings.
2013-01-09 18:01:54 +01:00
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
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
7696081fdb
org-e-latex: Added an attribute to inline images
...
* contrib/lisp/org-e-latex.el (org-e-latex--inline-image): Added an
attribute, :comment-include, to toggle commenting the \includegraphics
call.
Journals sometimes ask for a list of figure captions.
2013-01-09 16:07:21 +01:00
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
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
1dd1b10d5a
Merge branch 'maint'
2013-01-09 14:11:12 +01:00
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
81959fc8c0
Merge branch 'maint'
2013-01-09 12:53:04 +01:00
31e765a105
org.texi: Update documentation on internal link handling
...
* org.texi (Handling links): Update the mention to the
obsolete variable `org-link-to-org-use-id' with a mention to
the newer variable `org-id-link-to-org-use-id'. Mention the
need to load the org-id library.
TINYCHANGE
2013-01-09 12:52:52 +01:00
94ea6bca08
Merge branch 'maint'
2013-01-08 23:44:59 +01:00
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
832b6e66ea
Merge branch 'maint'
2013-01-08 22:33:52 +01:00
8c5a46c35d
doc/org.texi: Update copyright year.
2013-01-08 22:33:33 +01:00
bb15139ab7
Merge branch 'maint'
2013-01-08 18:40:01 +01:00
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
7330e2a8a4
Merge branch 'maint'
2013-01-08 18:33:09 +01:00
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
b4ff6d9727
Merge branch 'maint'
2013-01-08 16:34:38 +01:00
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
57f4e17f99
Merge branch 'maint'
2013-01-08 16:19:39 +01:00
c8c217aa55
org.texi: Document `org-mark-element' and `org-mark-subtree'
...
* org.texi (Structure editing): Document `org-mark-element'
and `org-mark-subtree'.
(Tag inheritance): Document `org-agenda-use-tag-inheritance'.
Thanks to Nathaniel Cunningham for requesting this.
2013-01-08 16:19:31 +01:00
f5e478a401
Merge branch 'maint'
2013-01-08 15:57:17 +01:00
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
679dce0fda
Merge branch 'maint'
2013-01-08 15:26:17 +01:00
31c1aeabae
Various small fixes
2013-01-08 15:26:04 +01:00
5fc740a230
Merge branch 'maint'
2013-01-08 15:04:40 +01:00
72bc144c15
Update Copyright lines to match Emacs format.
2013-01-08 15:04:32 +01:00
1e38a8162c
Merge branch 'maint'
2013-01-08 14:30:44 +01:00
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
6c3ef62266
Merge branch 'maint'
...
Conflicts:
doc/orgguide.texi
2013-01-08 12:11:08 +01:00
2d81219147
doc/orgguide.texi: Update menu
2013-01-08 12:09:39 +01:00
86737d323e
Merge branch 'maint'
2013-01-08 11:54:58 +01:00
0bcb86f4ca
etc/ORG-NEWS: Update
2013-01-08 11:46:29 +01:00
7a186dc005
Merge branch 'maint'
2013-01-08 11:34:18 +01:00
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
c7d18ea892
org-e-icalendar: Apply 195173eef0
...
* contrib/lisp/org-e-icalendar.el (org-e-icalendar-convert-timestamp):
Apply 195173eef0
2013-01-08 10:37:56 +01:00
d9649ca7a2
Merge branch 'maint'
2013-01-08 10:36:47 +01:00
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
e2f95037e4
Merge branch 'master' of orgmode.org:org-mode
2013-01-08 08:04:46 +01:00
daa35c0c68
Merge branch 'maint'
2013-01-08 08:04:36 +01:00
44d1a69eab
org.el (org-setup-filling): Set `auto-fill-inhibit-regexp' from `org-outline-regexp'
...
* org.el (org-setup-filling): Set `auto-fill-inhibit-regexp'
from `org-outline-regexp'.
Thanks to John Hendy for reporting a problem in this area.
2013-01-08 08:04:24 +01:00
5328e1cd02
no hline pre-processing for elisp code blocks
...
* doc/org.texi (hlines): Note that :hline has no effect for Emacs Lisp
code blocks.
2013-01-07 23:38:15 -07:00
45ed388387
Merge branch 'maint'
2013-01-08 00:00:03 +01:00
195173eef0
org-icalendar.el (org-icalendar-ts-to-string): Fix bug in converting timezone
...
org-icalendar.el (org-icalendar-ts-to-string): Fix bug in converting
timezone.
TINYCHANGE
2013-01-07 23:59:30 +01:00
7feec64988
Merge branch 'maint'
2013-01-07 22:29:11 +01:00
55a4789661
etc/ORG-NEWS: Add information about Org 7.9.3
2013-01-07 22:28:54 +01:00
Bastien Guerry
Eric Schulte
Nicolas Richard
Thomas Dye
Nicolas Goaziou
Michael Albinus
François Allisson
David Engster