Bastien Guerry
1e402cee8b
Merge branch 'maint'
2014-03-12 10:47:01 +01:00
Bastien Guerry
3e560f053c
Backport r116740 from Emacs trunk
2014-03-12 10:46:50 +01:00
Nicolas Goaziou
081abcd652
Merge branch 'maint'
2014-03-12 08:58:55 +01:00
John Henderson
ffc60fd494
Modified documentation for `org-src-preserve-indentation'
...
TINYCHANGE
2014-03-12 08:58:13 +01:00
tsdye
162dc4d5fd
Documented org-babel-inline-result-wrap
2014-03-11 19:43:42 -06:00
Bastien Guerry
080f1dd5af
Merge branch 'maint'
2014-03-05 15:47:55 +01:00
Bastien Guerry
adbb2f7c9f
Fix doc and code inconsistency: now use =verbatim= and ~code~.
...
* org.el (org-emphasis-alist): Use `org-verbatim' for =text=
and `org-code' for ~text~.
* org.texi (Emphasis and monospace): Document the use of
=verbatim= and ~code~ to be consistent with
`org-element-text-markup-successor'.
Thanks to Yasushi for reporting this.
2014-03-04 10:49:49 +01:00
Michael Brand
076b8e1dbf
Merge branch 'maint'
2014-02-11 21:02:35 +01:00
Michael Brand
9061fe5fbe
org.texi: Fix typo
2014-02-11 21:01:24 +01:00
Michael Brand
b6025f42d3
Merge branch 'maint'
2014-02-11 19:31:21 +01:00
Michael Brand
9de9c0d1b5
org.texi: Column attributes format specifier
...
* doc/org.texi (Column attributes): Add a sentence to point out the
dependency on the format specifier.
2014-02-11 19:30:52 +01:00
Bastien Guerry
f05d148e61
Merge branch 'maint'
...
Conflicts:
doc/org.texi
2014-02-06 11:36:50 +01:00
Bastien Guerry
49b25fff59
org.texi (In-buffer settings, Radio tables): Tiny fixes
...
* org.texi (In-buffer settings, Radio tables): Tiny fixes.
2014-02-06 11:31:32 +01:00
Bastien Guerry
986ca8883c
org.texi (Initial visibility): Fix typo
...
* org.texi (Initial visibility): Fix typo.
2014-02-06 11:25:03 +01:00
Bastien Guerry
e96cda127a
doc/org.texi: Fix trailing whitespace
2014-02-05 11:14:12 +01:00
Florian Beck
01e8103f8f
Font-lock: allow hiding of brackets surrounding macros
...
* lisp/org.el (org-hide-macro-markers): new option
(org-fontify-macros): new function
(org-set-font-lock-defaults): call `org-fontify-macros'
* doc/org.texi: Document user option `org-hide-macro-markers'
TINYCHANGE
2014-02-05 11:13:39 +01:00
Bastien Guerry
e45d13d94e
Merge branch 'maint'
2014-01-28 11:20:42 +01:00
Bastien Guerry
b298a47eb1
org.texi (Literal examples): Fix typo
...
* org.texi (Literal examples): Fix typo.
2014-01-28 11:20:29 +01:00
Nicolas Goaziou
e0d14e6aa7
Merge branch 'maint'
2014-01-25 14:57:46 +01:00
Nicolas Goaziou
b2dce80601
ox-latex: Fix :options discrepancy between blocks and lists
...
* lisp/ox-latex.el (org-latex-plain-list): Do not automatically
enclose value for :options attribute within square brackets.
Instead, append them verbatim next to the block name, as special
blocks do.
* doc/org.texi (@LaTeX{} specific attributes): Update manual.
2014-01-25 14:56:49 +01:00
Bastien Guerry
dd412491b3
Merge branch 'maint'
2014-01-13 23:26:33 +01:00
Bastien Guerry
3f7822d31b
Backport typo fix from Emacs revno r116017
2014-01-13 23:26:17 +01:00
Michael Brand
bc1d54b84b
TBLFM remote ref: Add indirection of name or ID
...
* doc/org.texi (References): Add description for indirection of
NAME-OR-ID.
* lisp/org-table.el (org-table-eval-formula): Make use of
`org-table-remote-reference-indirection'.
(org-table-remote-reference-indirection): New function.
* testing/lisp/test-org-table.el
(test-org-table/remote-reference-indirect): Change to use remote
reference indirection.
2014-01-12 10:53:06 +01:00
Nicolas Goaziou
d19fe8cb72
Merge branch 'maint'
2014-01-10 23:04:25 +01:00
Nicolas Goaziou
de8884f38e
org.texi: Fix typo
...
* doc/org.texi (Top, Exporting): Fix typo.
2014-01-10 22:27:58 +01:00
Nicolas Goaziou
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
Nicolas Goaziou
99fdd76bb8
Merge branch 'maint'
2014-01-09 22:41:30 +01:00
Nicolas Goaziou
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
Achim Gratz
f18b153d7c
Merge branch 'maint'
2014-01-07 21:24:35 +01:00
Achim Gratz
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
Bastien Guerry
f8e1745440
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-07 14:19:03 +01:00
Bastien Guerry
7d9a883b50
Update copyright years again.
...
Hint: copyright years are all updated in Emacs.
2014-01-07 14:18:17 +01:00
Bastien Guerry
a0d4c8d85d
Merge branch 'maint'
2014-01-07 13:09:55 +01:00
Rasmus
5b7d53e713
Bug in org.texi
...
* org.texi (Global and local cycling): Fix missing '@'.
2014-01-07 13:09:45 +01:00
Bastien Guerry
115680e50d
Merge branch 'maint'
2014-01-07 10:15:27 +01:00
Bastien Guerry
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
Bastien Guerry
721cc10b5a
Merge branch 'maint'
2014-01-06 11:00:37 +01:00
Bastien Guerry
9590067793
Backport change from Emacs r115884
2014-01-06 11:00:28 +01:00
Bastien Guerry
c41f5075ac
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-05 06:36:11 +01:00
Bastien Guerry
3737676632
Update copyright year for files changed since 2013
2014-01-05 06:35:21 +01:00
Bastien Guerry
0beda99171
Revert "Update copyright years."
...
This reverts commit 21105594fc
.
2014-01-05 06:28:07 +01:00
Bastien Guerry
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
Bastien Guerry
096ff7e078
Merge branch 'maint'
...
Conflicts:
contrib/lisp/org-favtable.el
2014-01-04 18:58:12 +01:00
Bastien Guerry
21105594fc
Update copyright years.
2014-01-04 18:56:11 +01:00
Bastien Guerry
6e51188ead
Merge branch 'maint'
2014-01-02 16:11:08 +01:00
Bastien Guerry
03ce57e7db
Backport r115828 from Emacs trunk
2014-01-02 16:10:44 +01:00
Bastien Guerry
3c4a99c731
Merge branch 'maint'
2014-01-02 16:08:36 +01:00
Bastien Guerry
a66028dfc5
Revert "Backport change from r115807 in Emacs trunk"
...
This reverts commit c2ed678f20
.
2014-01-02 16:08:26 +01:00
Bastien Guerry
c8bb89faca
Merge branch 'maint'
2013-12-30 10:32:24 +01:00
Bastien Guerry
c2ed678f20
Backport change from r115807 in Emacs trunk
2013-12-30 10:10:56 +01:00