f05d148e61
Merge branch 'maint'
...
Conflicts:
doc/org.texi
2014-02-06 11:36:50 +01:00
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
986ca8883c
org.texi (Initial visibility): Fix typo
...
* org.texi (Initial visibility): Fix typo.
2014-02-06 11:25:03 +01:00
0db6b24164
Merge branch 'maint'
2014-02-06 09:58:30 +01:00
323c7b3de2
org-table.el: Fix bugs about cursor repositioning
...
* org-table.el (org-table-copy-down)
(org-table-find-dataline, org-table-move-row)
(org-table-insert-hline, org-table-kill-row): Use
`org-move-to-column' with the IGNORE-INVISIBLE arg set to `t',
so that abbreviated rows don't interfer with setting the
cursor back at the correct position.
Thanks to Jason Lewis for reporting one of these bugs.
2014-02-06 09:58:17 +01:00
f7b11e5d9e
Merge branch 'maint'
2014-02-06 00:27:47 +01:00
f4f3f140ac
Partially reapply fe3379bda6
...
* org.el (org-agenda-prepare-buffers): Use `save-excursion'
instead of `save-window-excursion'.
Thanks to Florian Beck for reporting this.
2014-02-06 00:27:33 +01:00
d7bbf362da
Revert "org.el (org-agenda-prepare-buffers): Restore the point position"
...
This reverts commit fe3379bda6
2014-02-06 00:25:16 +01:00
059f87f448
ox-koma-letter: Reorder "SUBJECT" in template
2014-02-05 17:06:19 +01:00
63d788653e
ox-koma-letter: Use `org-koma-letter-use-title'
...
* contrib/lisp/ox-koma-letter.el (org-koma-letter-template): Use
`org-koma-letter-use-title'. Small refactoring.
2014-02-05 17:05:08 +01:00
7eb570b860
Fix left-over merge conflict
2014-02-05 16:33:24 +01:00
13b5123da1
Merge branch 'maint'
...
Conflicts:
contrib/lisp/ox-koma-letter.el
2014-02-05 16:16:36 +01:00
a6f81047a4
org.el (org-file-contents): Return an empty string instead of the message
...
* org.el (org-file-contents): Return an empty string instead
of the message.
2014-02-05 16:15:55 +01:00
980c021609
Allow separate subject and title in ox-koma-letter
...
* ox-koma-letter.el (org-koma-letter-use-title): New variable.
(org-koma-letter-prefer-subject): New variable.
(org-koma-letter-template): Allow separate subject and title.
Signed-off-by: Alan Schmitt <alan.schmitt@polytechnique.org>
2014-02-05 13:45:58 +01:00
1f413ba32d
Documentation fixes for ox-koma-script.el
...
* ox-koma-letter.el commentary (org-koma-letter-use-backaddress):
Better documentation.
Signed-off-by: Alan Schmitt <alan.schmitt@polytechnique.org>
2014-02-05 13:45:41 +01:00
240cd3cb40
Documentation fixes for ox-koma-script.el
...
* ox-koma-letter.el commentary (org-koma-letter-use-backaddress):
Better documentation.
Signed-off-by: Alan Schmitt <alan.schmitt@polytechnique.org>
2014-02-05 13:30:38 +01:00
e96cda127a
doc/org.texi: Fix trailing whitespace
2014-02-05 11:14:12 +01:00
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
aa19233d80
Merge branch 'maint'
2014-02-05 10:57:01 +01:00
a08bff4138
org.el (org-open-at-point): Fix bug when opening a plain link followed by a bracket link
...
* org.el (org-open-at-point): Fix bug when opening a plain
link followed by a bracket link.
Thanks to John Kitchin for reporting this.
2014-02-05 10:56:50 +01:00
655e07730b
org-agenda.el: Allow to move backward/forward blocks
...
* org-agenda.el (org-agenda-find-same-or-today-or-agenda): Use
`org-agenda-backward-block'.
(org-agenda-backward-block): Renamed and rewritten from
`org-agenda-goto-block-beginning'.
(org-agenda-forward-block): New command.
(org-agenda-mode-map): Remap `backward-paragraph' and
`forward-paragraph' to `org-agenda-backward-block' and
`org-agenda-forward-block' respectively.
Thanks to Bart Bunting for raising this.
2014-02-05 10:33:03 +01:00
5f0ca0ee92
Renaming of ob-sh to ob-shell: various fixes
...
* lisp/org.el (org-babel-load-languages):
* testing/org-test.el:
* testing/README: change 'sh' to 'shell'
* testing/lisp/test-ob-sh.el: re-rename test file (fixes 80754a8
2014-02-02 00:08:56 -07:00
dda9461fbb
Merge branch 'maint'
...
Conflicts:
lisp/org-element.el
2014-02-01 23:33:58 +01:00
8e1386cead
org-element: Fix smart quotes in TITLE
...
* lisp/org-element.el (org-element-interpret-data): Do not remove
properties by side-effect when interpreting a string, as it also
removes them from the parse tree, making the string unusable without
its :parent property.
If text properties get in the way, it is also possible to use
`substring-no-properties' but then, a compatibility function would be
required for XEmacs.
2014-02-01 23:25:47 +01:00
8b1ffc717b
org-index.el: Version 2.42, sorting for x-columns
2014-02-01 23:11:18 +01:00
8f91f657e1
Merge branch 'maint'
2014-02-01 21:54:03 +01:00
ac2f516edf
ob-exp: Do not ignore `org-src-preserve-indentation'
...
* lisp/ob-exp.el (org-babel-exp-process-buffer): Also check
`org-src-preserve-indentation' to know when to preserve indentation.
* testing/lisp/test-ob-exp.el (ob-export/export-and-indentation): New
test.
Thanks to John Hendy for reporting it.
2014-02-01 21:52:43 +01:00
4df24f5fc8
Merge branch 'maint'
2014-02-01 01:09:00 +01:00
ccc4f6b96e
Fix d035a9af6
...
Thanks to Nicolas for providing the correct fix.
2014-02-01 01:08:42 +01:00
c89827dc37
Revert "org.el (org-ctrl-c-ctrl-c): Bugfix"
...
This reverts commit d035a9af6chttp://article.gmane.org/gmane.emacs.orgmode/81752
2014-02-01 01:06:25 +01:00
ca0c77033d
ox.el (org-export-insert-default-template): Require match
...
* ox.el (org-export-insert-default-template): Require match
when completing.
2014-01-31 18:04:18 +01:00
bdeac998c8
Merge branch 'maint'
2014-01-31 15:53:54 +01:00
d035a9af6c
org.el (org-ctrl-c-ctrl-c): Bugfix
...
* org.el (org-ctrl-c-ctrl-c): Fix behavior when hitting C-c
C-c on LaTeX formulas in tables.
2014-01-31 15:53:42 +01:00
21ce3296b7
Merge branch 'maint'
2014-01-31 10:39:06 +01:00
7ddebe5c7b
Revert "org.el (org-map-entries): Use `save-window-excursion'"
...
This reverts commit 3ec38f5c06
2014-01-31 10:38:50 +01:00
4068a829a1
org.el: Fix compiler warnings
2014-01-31 09:45:25 +01:00
23fa320af8
ob-tangle.el: Fix compiler warning
2014-01-31 09:43:46 +01:00
a391d528e0
ob-clojure.el: Fix compiler warnings
2014-01-31 09:39:34 +01:00
99a23ba436
Merge branch 'maint'
2014-01-30 12:43:02 +01:00
53c664c4ec
org.el (org-refile--get-location): New internal function
...
* org.el (org-refile--get-location): New internal function
using a wider set of possible refile locations.
(org-refile-get-location): Use it.
2014-01-30 12:42:13 +01:00
98de33a9ac
Merge branch 'maint'
2014-01-30 12:21:51 +01:00
f3ed0f7c6c
org.el (org-refile): Fix bug when refiling the last subtree
...
* org.el (org-refile): Fix bug when refiling the last subtree
of the buffer: don't leave out the last character.
2014-01-30 12:21:39 +01:00
de087d0bbe
ob-clojure.el (org-babel-execute:clojure): Fix output
...
* ob-clojure.el (org-babel-execute:clojure): Use
`org-babel-result-cond' to create the correct output.
Thanks to Soapy Smith who reported this and to Eric Schulte for providing the fix.
2014-01-30 12:10:37 +01:00
cf2c7e9f18
Merge branch 'maint'
2014-01-30 11:59:57 +01:00
3c71ab34dd
org.el (org-sort-entries): Restore the point location when there is nothing to sort
...
* org.el (org-sort-entries): Restore the point location when
there is nothing to sort.
2014-01-30 11:59:25 +01:00
ca69fdd884
org-table.el (org-table-field-info): Throw a user error when not at a table
...
* org-table.el (org-table-field-info): Throw a user error when
not at a table.
2014-01-30 11:58:28 +01:00
7fc6d3df39
org-agenda.el (org-agenda-drag-line-forward): Call`org-agenda-mark-clocking-task' when done
...
* org-agenda.el (org-agenda-drag-line-forward): Call
`org-agenda-mark-clocking-task' when done.
(org-agenda-mark-clocking-task): Small refactoring.
2014-01-30 11:57:43 +01:00
9368d317fb
ob-tangle.el (org-babel-under-commented-heading-p): Throw nil when called before the first heading
...
* ob-tangle.el (org-babel-under-commented-heading-p): Throw
nil when called before the first heading.
Thanks to John Kitchin for reporting this.
2014-01-30 00:57:24 +01:00
72ad5257fc
Merge branch 'maint'
2014-01-29 14:58:14 +01:00
33a0a198e3
org.el (org-store-link): Fix selection of the function to store the link
...
* org.el (org-store-link): Fix selection of the function to
store the link.
2014-01-29 14:57:45 +01:00
Bastien Guerry
Nicolas Goaziou
Rasmus
Florian Beck
Nicolas Richard
Marc-Oliver Ihm
Benjamin Drieu