0652a10bf3
Merge branch 'master' of orgmode.org:org-mode
2014-01-09 00:03:06 +01:00
87234bee55
Merge branch 'maint'
2014-01-08 22:50:52 +01:00
ba4852ec74
ox-md: Prevent error with empty items
...
* lisp/ox-md.el (org-md-item): Do not return an error when exporting
an empty item.
2014-01-08 22:47:10 +01:00
248bc714b5
Merge branch 'maint'
2014-01-08 18:32:00 +01:00
884faddd57
Revert "ob-python.el (org-babel-python-var-to-python): Fix code typo"
...
This reverts commit e88d9d7caf
2014-01-08 18:31:50 +01:00
8285763b97
update psql command to respect :colnames
...
Suggested by Joost Helberg on the Mailing list.
TINYCHANGE
* lisp/ob-sql.el (org-babel-execute:sql): Update psql command to
respect :colnames.
2014-01-08 09:57:40 -07:00
d310a87605
Merge branch 'maint'
2014-01-08 17:29:45 +01:00
e88d9d7caf
ob-python.el (org-babel-python-var-to-python): Fix code typo
...
* ob-python.el (org-babel-python-var-to-python): Fix code typo.
Thanks to Daniel Gerber for reporting this.
2014-01-08 17:29:31 +01:00
1f4b6a1e03
Merge branch 'maint'
2014-01-08 16:12:28 +01:00
e5b84d14cd
org-entities.el: Fix display of pretty entities
...
* org-entities.el (org-entities-help): Prevent the display of
pretty entities, as this help buffer is meant to list literal
strings, not utf-8 representations.
Thanks to Brice Waegenire for reporting this.
2014-01-08 16:12:15 +01:00
a24e6420be
ob-J: Silence byte-compiler
2014-01-07 21:56:22 +01:00
09f148ec2e
Merge branch 'maint'
2014-01-07 21:54:42 +01:00
fc09ad3be4
ox-beamer: Fix bug when an selecting environment
...
* lisp/ox-beamer.el (org-beamer-select-environment): Function doesn't
work if fast tag selection is disabled, so make sure it is always
on, independently on user's configuration.
Reported-by: Anders Johansson <mejlaandersj@gmail.com>
2014-01-07 21:50:44 +01:00
f18b153d7c
Merge branch 'maint'
2014-01-07 21:24:35 +01:00
6dc83e651d
doc/Makefile: avoid spurious whitespace in environment variables
...
* doc/Makefile (%.pdf): Ensure that LANG and LC_ALL are set to "C",
not "C " (with trailing whitespace).
Make evaluation order produces spurious whitespace in variables when a
variable definition is followed by whitespace plus a comment.
2014-01-07 21:23:45 +01:00
677b228104
ox-bibtex: Allow nil style
...
* contrib/lisp/ox-bibtex.el (org-bibtex-process-bib-files,
org-latex-keyword): Allow nil style.
2014-01-07 17:23:27 +01:00
f8e1745440
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-07 14:19:03 +01:00
7d9a883b50
Update copyright years again.
...
Hint: copyright years are all updated in Emacs.
2014-01-07 14:18:17 +01:00
ccbe3965b1
Merge branch 'maint'
2014-01-07 13:26:12 +01:00
152712a7c8
Backport change from Chong on 2013-12-23
2014-01-07 13:25:30 +01:00
a0d4c8d85d
Merge branch 'maint'
2014-01-07 13:09:55 +01:00
5b7d53e713
Bug in org.texi
...
* org.texi (Global and local cycling): Fix missing '@'.
2014-01-07 13:09:45 +01:00
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
Bastien Guerry
Nicolas Goaziou
Eric Schulte
Achim Gratz
Rasmus
U-usuario-PC\\usuario