89147ede72
Merge branch 'maint' of orgmode.org:org-mode into maint
2014-01-11 01:35:00 +01:00
21472107fa
org.el (org-ellipsis): Small docstring enhancement
...
* org.el (org-ellipsis): Small docstring enhancement.
2014-01-11 01:34:44 +01:00
d19fe8cb72
Merge branch 'maint'
2014-01-10 23:04:25 +01:00
de8884f38e
org.texi: Fix typo
...
* doc/org.texi (Top, Exporting): Fix typo.
2014-01-10 22:27:58 +01:00
8abdb06274
Merge branch 'master' of orgmode.org:org-mode
2014-01-10 21:01:44 +01:00
8ac18f6d22
Merge branch 'maint' of orgmode.org:org-mode into maint
2014-01-10 21:00:32 +01:00
f5380d1221
Merge branch 'maint'
2014-01-10 11:25:15 +01:00
8720c49807
Speed improvement
...
* lisp/org.el (org-get-previous-line-level): Do not call
`org-current-level' twice unless necessary. Also, avoid using
`line-number-at-pos' when the information needed is to know if point
is in the first line of the visible part of the buffer.
2014-01-10 11:22:49 +01:00
fcdf05b141
org.texi: Fix sectioning
...
* doc/org.texi (Global and local cycling): Remove "Initial visibility"
and "Catching invisible edits" subsections since they already are
located in "Visibility cycling" menu.
2014-01-10 11:07:17 +01:00
3f8aee0ed0
Merge branch 'maint'
2014-01-10 10:30:07 +01:00
be63eb6905
Backport changes from r115955
2014-01-10 10:29:53 +01:00
1d7bf33c5f
ox-html: Fix a docstring
...
* lisp/ox-html.el (org-html-allow-name-attribute-in-anchors): Default
value changed in 36a21d9372
2014-01-10 10:07:22 +01:00
d0538affec
ox-html: Fix a docstring
...
* lisp/ox-html.el (org-html-checkbox-types): Emphasize valid symbols
to use for configuration.
2014-01-10 10:00:17 +01:00
78e66c7212
ox-html: Fix checkbox customization
...
* lisp/ox-html.el (org-html-checkbox-types): Fix docstring.
(org-html-checkbox-type): Use symbols instead of strings. It avoids
to rely on `intern' later on. Modify docstring so its first line
contains only a complete sentence.
(org-html-checkbox): Use `assq' instead of `assoc'.
This fixes 2c782da801
2014-01-10 09:52:08 +01:00
2c782da801
Add customization options for html checkboxes.
...
(org-html-checkbox-types): New constant. Contains unicode, ascii and html
checkbox alists.
(org_html_checkbox_type): New customzation variable can be set to one
of the above choices. Defaults to "ascii"
(org-html-checkbox): Use the appropriate set of checkboxes as
specified in `org-html-checkbox-type'.
2014-01-09 18:04:09 -05:00
36a21d9372
Default `org-html-allow-name-attribute-in-anchors' to nil for HTML5
...
compatibily.
2014-01-09 18:00:52 -05:00
99fdd76bb8
Merge branch 'maint'
2014-01-09 22:41:30 +01:00
432decf725
org.texi: Fix some sections subtitiles
...
* doc/org.texi (Top, Exporting): Org has its own documentation and
should therefore be removed from "Other build-in back-ends".
2014-01-09 22:37:57 +01:00
b8028c607d
Merge branch 'maint'
2014-01-09 21:37:11 +01:00
81ce406d8f
ob-core: Speed improvement
...
* lisp/ob-core.el (org-babel-get-inline-src-block-matches): Do not
compute line number if all is needed is to know if we're on the
first one.
2014-01-09 21:36:25 +01:00
9c1bc61cce
Merge branch 'maint'
2014-01-09 20:11:07 +01:00
34af2fe7ff
Fix multiple TBLFM
...
Simplify commit release_8.2.4-14-geb28fe4 and commit
release_8.2.5c-8-ga2619b7.
* org-table.el (org-table-fix-formulas): Handle multiple #+TBLFM lines
with `forward-line'.
2014-01-09 20:10:19 +01:00
f75f3dd1c1
org-element: Fix `org-element-at-point' at eob
...
* lisp/org-element.el (org-element-at-point): Return appropriate value
when point is at end of buffer and a cached element was found above.
2014-01-09 11:55:49 +01:00
e0f46e9a1d
Merge branch 'maint'
2014-01-09 11:03:11 +01:00
a2619b7145
org-table.el (org-table-fix-formulas): Fix commit eb28fe
...
Thanks to Michael Brand for reporting this.
2014-01-09 11:03:01 +01:00
213c78f73c
Merge branch 'maint'
2014-01-09 00:48:16 +01:00
abed7277e1
Backport typo fixes from Emacs revno r115923
2014-01-09 00:47:40 +01:00
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
Bastien Guerry
Nicolas Goaziou
Rick Frankel
Michael Brand
Eric Schulte
Achim Gratz
Rasmus