115680e50d
Merge branch 'maint'
2014-01-07 10:15:27 +01:00
beeebfb9a6
org.texi (Global and local cycling): Mention C-u C-u TAB
...
* org.texi (Global and local cycling): Mention C-u C-u TAB.
Thanks to François Pinard for suggesting this.
2014-01-07 10:15:13 +01:00
eb79f0e35d
Merge branch 'maint'
2014-01-06 11:02:31 +01:00
2755f8d954
Backport spelling fixes from Emacs r115885
...
* org-clock.el (org-clock-cancel-hook)
(org-clock-leftover-time): Fix typo in docstring.
2014-01-06 11:02:18 +01:00
721cc10b5a
Merge branch 'maint'
2014-01-06 11:00:37 +01:00
9590067793
Backport change from Emacs r115884
2014-01-06 11:00:28 +01:00
e32ebb6c1a
org-element: Change data structure for cache
...
* lisp/org-element.el (org-element-at-point, org-element-cache-get,
org-element-cache-put, org-element--cache-sync): Complete rewrite to
use new data structure.
(org-element-context, org-element-cache-reset): Slight change in order
to use new tools to access cached data.
(org-element-cache-merge-changes-threshold): Renamed from
`org-element--cache-merge-changes-threshold'.
(org-element-cache-sync-idle-time): Renamed from
`org-element--cache-sync-idle-time'.
(org-element--cache-objects): New variable.
Now elements are stored in AVL tree and objects in a hash table. Also
moved functions relative to cache into a specific section of the file.
2014-01-05 23:08:18 +01:00
594b7808a1
org-element: Fix parsing orphaned affiliated keywords
...
* lisp/org-element.el (org-element-keyword-parser): Fix parsing
orphaned affiliated keywords.
2014-01-05 23:08:18 +01:00
d361f465e9
ox: Change meaning of `org-export-with-\(table\|fixed-width\)
...
* lisp/ox.el (org-export-with-fixed-width, org-export-with-tables):
Change docstring to reflect new meaning.
(org-export--skip-p): Completely ignore tables and fixed-width areas
if appropriate option is nil.
* testing/lisp/test-ox.el (test-org-export/handle-options): Add tests.
2014-01-05 23:07:13 +01:00
e4a013fcf3
Merge branch 'maint'
2014-01-05 14:21:51 +01:00
66fd521264
org.el (org-set-tags): Ignore invisible text when restoring cursor position
...
* org.el (org-set-tags): Ignore invisible text when restoring
cursor position.
2014-01-05 14:21:38 +01:00
1792643794
Merge branch 'maint'
2014-01-05 14:15:00 +01:00
65cf7047bf
ob-gnuplot.el (org-babel-gnuplot-quote-tsv-field): Fix code typo
...
* ob-gnuplot.el (org-babel-gnuplot-quote-tsv-field): Fix code typo.
TINYCHANGE
2014-01-05 14:14:09 +01:00
361b18ea82
Delete org-favtable.el
2014-01-05 06:37:36 +01:00
c41f5075ac
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-05 06:36:11 +01:00
3737676632
Update copyright year for files changed since 2013
2014-01-05 06:35:21 +01:00
0beda99171
Revert "Update copyright years."
...
This reverts commit 21105594fc
2014-01-05 06:28:07 +01:00
19b895b464
Backport changes from Emacs r115870
...
* org.texi (Include files, The Export Dispatcher)
(Advanced configuration)
(Header arguments in Org mode properties): Spelling fixes.
2014-01-05 06:24:20 +01:00
455fbca5f8
ox-md: Handle HTML export blocks
...
* lisp/ox-md.el (org-md-export-block): Handle HTML export blocks.
2014-01-05 00:48:58 +01:00
af2fa1da6a
ox-md: Add support for MD, MARKDOWN keywords
...
* lisp/ox-md.el (org-md-keyword): New function.
(org-md-export-block): Allow "MARKDOWN" blocks.
2014-01-04 20:19:24 +01:00
83b7f49f38
ox-md.el: Add export-block
...
* ox-md.el (org-md-export-block): New function.
(md): Use it.
2014-01-04 19:20:23 +01:00
096ff7e078
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-04 18:58:12 +01:00
21105594fc
Update copyright years.
2014-01-04 18:56:11 +01:00
bb591bf0a3
Merge branch 'maint'
2014-01-04 18:16:02 +01:00
8044cfed1c
Revert "* server.mk (elpaplus-dirty elpaplus-up): Include htmlize.el."
...
This reverts commit fc5cf0d922
2014-01-04 18:15:42 +01:00
402494fbd2
Merge branch 'master' of orgmode.org:org-mode
2014-01-04 18:15:00 +01:00
17c3091f15
Merge branch 'maint'
2014-01-04 18:09:59 +01:00
b8a495d2ed
Fix ox-odt bugs
...
* ox-odt.el (org-odt--frame): Add a draw:name property to the
draw:frame tag.
(org-odt-format-label): Don't use short-caption at all.
See http://article.gmane.org/gmane.emacs.orgmode/79910
and http://article.gmane.org/gmane.emacs.orgmode/79892
for threads about these issues.
2014-01-04 18:09:31 +01:00
24ff7c648b
Add image drag-and-drop and screenshot support to org-mode.
2014-01-04 16:20:23 +01:00
0965364707
Merge branch 'maint'
2014-01-04 15:28:04 +01:00
e764dfe80b
org-rmail.el (org-rmail-follow-link): Don't raise an error when no article is matched
...
* org-rmail.el (org-rmail-follow-link): Don't raise an error
when no article is matched.
2014-01-04 15:27:53 +01:00
d09088ca17
Merge branch 'maint'
2014-01-04 15:05:13 +01:00
45b0d23b0c
Fix creation of parent nodes when refiling.
...
* org.el (org-refile-get-location): Check for a refile
position when the position is not nil, otherwise allow to
create the parent node if the user requests it.
Thanks to Li Zhuo for reporting this bug and for providing
a preliminary patch.
2014-01-04 15:05:01 +01:00
c36ab62b11
Merge branch 'maint'
2014-01-04 14:53:10 +01:00
857cf28a90
org.el (org-refile-allow-creating-parent-nodes): Fix typo in docstring
...
* org.el (org-refile-allow-creating-parent-nodes): Fix typo in
docstring.
2014-01-04 14:53:00 +01:00
31c5e3dc8c
Merge branch 'maint'
2014-01-04 14:49:07 +01:00
2aeb5f0cad
Merge branch 'maint' of orgmode.org:org-mode into maint
2014-01-04 14:48:51 +01:00
597a7e65f0
org.el (org-entry-get): Minor docstring enhancement
...
* org.el (org-entry-get): Minor docstring enhancement.
2014-01-04 14:48:39 +01:00
7ef92ae121
Merge branch 'maint'
2014-01-04 14:29:03 +01:00
9b0067e166
ox-icalendar: Fix BBDB anniversaries integration
...
* lisp/ox-icalendar.el (org-icalendar--combine-files): Make sure
anniversaries do not end up in *Message* buffer instead of the ICS
file.
Patch-by: Thomas Baumann <tbaumann@tum.de>
2014-01-04 14:26:19 +01:00
02078833e0
Merge branch 'maint'
2014-01-04 12:23:27 +01:00
44acd00049
org.el (org-set-startup-visibility): Bugfix
...
* org.el (org-set-startup-visibility): Bugfix.
See http://article.gmane.org/gmane.emacs.orgmode/79905
2014-01-04 12:22:50 +01:00
7e1ea27e78
Small updates to org-index.el
2014-01-03 19:58:38 +01:00
f69d4cef82
Updated org-index.el to Version 2.4
2014-01-03 18:38:17 +01:00
914f3f88a7
Merge branch 'maint'
2014-01-03 17:38:19 +01:00
bee871762c
org.el (org-shiftcontrolup, org-shiftcontroldown): Ignore `org-support-shift-select' when point is on a clock log
...
* org.el (org-shiftcontrolup, org-shiftcontroldown): When
`org-support-shift-select' is not `nil', let-bind it to nil
if point is on a clock log. Otherwise throw an error.
2014-01-03 17:38:02 +01:00
62375dc3e5
Merge branch 'maint'
2014-01-03 17:16:10 +01:00
6492b9cde4
ob-lob.el: Minor custom and docstring fixes
...
* ob-lob.el (org-babel-lob-files): Fix custom type.
(org-babel-lob-ingest): Small docstring fix.
Thanks to Glenn Morris for reporting them.
2014-01-03 17:15:34 +01:00
d97c050720
Merge branch 'maint'
2014-01-03 16:04:06 +01:00
adb6e545c7
org-agenda.el (org-cmp-ts): Fix bug
...
* org-agenda.el (org-cmp-ts): Fix bug: interpret `late' as
`later than any date' instead of `later than today'.
Thank to Michael Crouch for reporting this and to Michael Hoffman for
providing the fix.
2014-01-03 16:01:30 +01:00
Bastien Guerry
Nicolas Goaziou
U-usuario-PC\\usuario
Oleh Krehel
Marc-Oliver Ihm