1
0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-05 08:53:36 +00:00
Commit Graph

15477 Commits

Author SHA1 Message Date
Michael Brand
ea4eb4f10f Add ERT for TBLFM with sub-total
* testing/lisp/test-org-table.el (test-org-table/sub-total): Add a use
case of grouped rows with sub-total.
2014-02-16 10:04:46 +01:00
Nicolas Goaziou
ec09989cb1 Merge branch 'maint' 2014-02-14 17:29:34 +01:00
Nicolas Goaziou
d25a2967b9 ox-md: Generate md links to other Org files
* lisp/ox-md.el (org-md-link): Generate md links to other Org files
  instead of html links.

Thanks to Mark Janssen for suggesting it.
2014-02-14 17:28:03 +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
bd0f9b8052 Merge branch 'maint' 2014-02-11 15:39:23 +01:00
Bastien Guerry
b84559f422 org-colview.el (org-columns-display-here): Fix column view
* org-colview.el (org-columns-display-here): Fix the column
view for numbers with a format specifier (e.g. {+; %5.1f}).

Thanks to OSiUX and Michael Brand for reporting this.
2014-02-11 15:39:09 +01:00
Bastien Guerry
5edf83c694 Merge branch 'maint' 2014-02-11 11:09:16 +01:00
Rick Frankel
9715523abe Fix escaping of links in html export.
* lisp/ox-html.el (org-html-link): Unescape org-escaped links an
  re-escape for html (browser).
2014-02-11 11:08:57 +01:00
Eric Schulte
b896bd43ad add :cmdline support to shell code blocks
* lisp/ob-shell.el (org-babel-execute:shell): Pass the cmdline header
  argument to `org-babel-sh-evaluate'.
  (org-babel-sh-evaluate): Pass the cmdline header argument to
  `call-process-shell-command'.
2014-02-09 20:13:39 -07:00
Bastien Guerry
05cd942f31 Merge branch 'maint' 2014-02-09 14:54:23 +01:00
Bastien Guerry
0ceb68d599 org-src.el (org-edit-src-code): Throw a warning instead of an error
* org-src.el (org-edit-src-code): Throw a warning instead of
an error when loading the mode fails, otherwise the user is
left with unusable buffers.

Thanks to Florian Beck for suggesting this.
2014-02-09 14:54:12 +01:00
Michael Brand
7fd1838e78 org-feed.el: Add config variant for current buffer
* lisp/org-feed.el (org-feed-alist): When FILE is nil the target
becomes the current buffer each time the feed update is invoked.
2014-02-08 18:09:42 +01:00
Nicolas Goaziou
9d85d96748 Merge branch 'maint' 2014-02-08 15:51:07 +01:00
Nicolas Goaziou
87b48e5a28 ox-md: Fix image transcoding
* lisp/ox-md.el (org-md-link): Do not confuse caption and alt-text.
  Provide "img" as default alt-text.
2014-02-08 15:45:25 +01:00
Nicolas Goaziou
def5cd8ca5 Merge branch 'maint' 2014-02-07 20:08:29 +01:00
Nicolas Goaziou
7f287d1b62 org-element: Fix indentation normalization
* lisp/org-element.el (org-element-normalize-contents): Do not ignore
  empty lines when an object follows.
* testing/lisp/test-org-element.el (test-org-element/normalize-contents):
  Add test.
2014-02-07 20:06:00 +01:00
Bastien Guerry
6a388c135f ob-core.el: Some renaming.
* ob-core.el (org-babel-insert-result): Use `org-babel-examplify-region'.
(org-babel-capitalize-examplize-region-markers): Rename to
`org-babel-capitalize-example-region-markers'.
(org-babel-examplize-region): Mark obsolete and rename to
`org-babel-examplify-region'.
2014-02-07 10:19:50 +01:00
Nicolas Goaziou
88731be902 Allow to turn on fixed-width marker on comment lines
* lisp/org.el (org-toggle-fixed-width): Allow to turn on fixed-width
  marker on comment lines.
2014-02-07 09:45:17 +01:00
Bastien Guerry
d535229205 Merge branch 'maint' 2014-02-07 09:25:04 +01:00
Bastien Guerry
ff41c56d11 request-assign-future.txt: Use "Emacs" instead of "Org-mode, which is part of Emacs"
request-assign-future.txt: Use "Emacs" instead of "Org-mode, which is part of Emacs"
2014-02-07 09:24:52 +01:00
Eric Schulte
e583eaa8f1 fix bug when results butt up against headline
* lisp/ob-core.el (org-babel-examplize-region): Don't treat
  exampleized regions adjoining headlines as inline examples.
2014-02-06 14:30:30 -07:00
Eric Schulte
61dbb84081 initial support for Coq code blocks 2014-02-06 14:30:30 -07:00
Nicolas Goaziou
b8665a0190 New function to toggle fixe-width areas
* lisp/org.el (org-toggle-fixed-width): New function.
* testing/lisp/test-org.el (test-org/toggle-fixed-with): New test.

This replaces the old implementation removed in commit
6a00c96541.
2014-02-06 18:55:14 +01:00
Bastien Guerry
27a978577f Merge branch 'maint' 2014-02-06 12:37:50 +01:00
Bastien Guerry
016a394de7 Fix 44acd0004
Thanks to Paul Stansell for reporting this.
2014-02-06 12:37:35 +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
0db6b24164 Merge branch 'maint' 2014-02-06 09:58:30 +01:00
Bastien Guerry
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
Bastien Guerry
f7b11e5d9e Merge branch 'maint' 2014-02-06 00:27:47 +01:00
Bastien Guerry
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
Bastien Guerry
d7bbf362da Revert "org.el (org-agenda-prepare-buffers): Restore the point position"
This reverts commit fe3379bda6.
2014-02-06 00:25:16 +01:00
Nicolas Goaziou
059f87f448 ox-koma-letter: Reorder "SUBJECT" in template 2014-02-05 17:06:19 +01:00
Nicolas Goaziou
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
Bastien Guerry
7eb570b860 Fix left-over merge conflict 2014-02-05 16:33:24 +01:00
Bastien Guerry
13b5123da1 Merge branch 'maint'
Conflicts:
	contrib/lisp/ox-koma-letter.el
2014-02-05 16:16:36 +01:00
Bastien Guerry
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
Rasmus
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
Rasmus
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
Rasmus
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
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
aa19233d80 Merge branch 'maint' 2014-02-05 10:57:01 +01:00
Bastien Guerry
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
Bastien Guerry
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
Nicolas Richard
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