323e05ad28
allow specification of python command w/header arg
...
Using the :python header arg.
* lisp/ob-python.el (org-babel-execute:python): Locally set
`org-babel-python-command' using a header argument.
2014-04-25 12:04:04 -06:00
c6d698a5ec
Merge branch 'maint'
2014-04-25 09:28:43 +02:00
fc37d1020a
Fix bug introduced in commit fdb4b54e
...
Thanks to Leonard Randall for reporting it.
2014-04-25 09:27:12 +02:00
36b497720d
Merge branch 'maint'
...
Conflicts:
lisp/org-element.el
2014-04-23 22:04:20 +02:00
94ae862515
org-element: Fix docstring
...
* lisp/org-element.el (org-element-timestamp-parser): Fix docstring.
2014-04-23 22:02:10 +02:00
4c40dc65d0
Merge branch 'maint'
2014-04-23 21:55:38 +02:00
c3e19caa1a
ox-icalendar: Tiny fixes
...
* lisp/ox-icalendar.el (org-icalendar-include-sexps,
org-icalendar-blocked-headline-p): Fix docstrings.
(org-icalendar-clear-blank-lines): Fix docstring and regexp.
2014-04-23 21:53:58 +02:00
f05bdc2d39
Merge branch 'maint'
2014-04-23 21:49:47 +02:00
967cbf8ea1
Fix commit 935b69e065
...
* lisp/ob-maxima.el (org-babel-execute:maxima): Correct a stray
occurence of setting `org-babel-maxima-graphical-output-file´ to
`org-babel-graphical-output-file´.
2014-04-23 21:38:43 +02:00
1819b90931
ox-icalendar: Use `org-icalendar-with-timestamps'
...
* lisp/ox-icalendar.el (org-icalendar-entry): Use
`org-icalendar-with-timestamps'.
We cannot simply rely on ignored timestamps in communication channels,
as regular `org-export-with-timestamps' only applies to isolated
timestamps.
Thanks to Greg Troxel for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/85387
2014-04-23 21:37:38 +02:00
7bfdadc601
Merge branch 'master' of orgmode.org:org-mode
2014-04-23 20:28:21 +02:00
1fd54bf8e0
Fix typos
...
* org.el (org-get-agenda-file-buffer): Fix docstring.
* ox-icalendar.el (org-icalendar-use-deadline): Fix typo in docstring.
2014-04-23 10:06:43 +02:00
0b0588b45b
Merge branch 'master' of orgmode.org:org-mode
2014-04-23 09:50:41 +02:00
096c9e8b71
ox-icalendar.el (org-icalendar-use-scheduled): Fix typo
...
* ox-icalendar.el (org-icalendar-use-scheduled): Fix typo.
2014-04-23 09:50:25 +02:00
51fed2bd9b
Merge branch 'maint'
2014-04-23 08:11:45 +02:00
e1e5c0776a
org-agenda.el (org-agenda-finalize): Filter by top headline
...
* org-agenda.el (org-agenda-finalize): Filter by top headline
if `org-agenda-top-headline-filter' is set.
Thanks to Brady Trainor for reporting this.
2014-04-23 08:11:29 +02:00
935b69e065
Replace org-babel-*-graphical-output-file with generic version
...
* lisp/ob-core.el (org-babel-graphical-output-file): New generic function.
* lisp/ob-R.el (org-babel-R-graphical-output-file): Delete specific version.
(org-babel-expand-body:R): Use generic version.
* lisp/ob-maxima.el (org-babel-maxima-graphical-output-file): Delete
specific version.
(org-babel-maxima-expand): Use generic version.
* lisp/ob-octave.el (org-babel-octave-graphical-output-file): Delete
specific version
(org-babel-execute:octave): Use generic version.
2014-04-22 15:31:15 -04:00
c7dff7105b
ob-core.el: Replace a use of remove with remq
...
* lisp/ob-core.el (org-babel-del-hlines): Use `remq' for `remove'
2014-04-22 15:30:12 -04:00
ef5900641c
org.el: use `user-error' instead of `error'.
...
* lisp/org.el (org-next-block, org-reftex-citation)
(org-create-math-formula, org-check-agenda-file)
(org-occur-next-match, org-auto-repeat-maybe)
(org-offer-links-in-entry, org-open-at-point)
(org-clone-subtree-with-time-shift):
Use `user-error' instead of `error'.
2014-04-22 15:29:38 -04:00
91da1b4c76
ox.el (org-export-time-stamp-file): Fix docstring typo
...
* ox.el (org-export-time-stamp-file): Fix docstring typo.
2014-04-22 17:39:01 +02:00
977b611250
Merge branch 'maint'
2014-04-22 15:24:28 +02:00
1fa6ccab10
Complete fix 369e3d77
2014-04-22 15:24:14 +02:00
69700e1c44
Merge branch 'maint'
2014-04-22 12:09:01 +02:00
099b6f0fb5
test-org.el: Fix test
...
* test-org.el (test-org/insert-todo-heading-respect-content):
Fix test.
2014-04-22 12:08:15 +02:00
4346e820b9
README_maintainer: Don't display sub/superscript
2014-04-22 11:53:48 +02:00
38ffaf061e
Merge branch 'maint'
...
Conflicts:
lisp/org.el
2014-04-22 11:18:58 +02:00
fdb4b54e92
org.el (org-insert-heading): Fix behavior
...
* org.el (org-insert-heading): Fix behavior when point is at
the beginning of a heading or a list item. Enhance docstring.
Thanks to York Zhao for reporting this.
2014-04-22 11:18:12 +02:00
f588f6d884
Merge branch 'maint'
2014-04-22 10:42:10 +02:00
6f1b5185c2
ox-html.el (org-html-infojs-install-script): Don't install infojs scripts when #+INFOJS_OPT: is empty
...
* ox-html.el (org-html-infojs-install-script): Don't install
infojs scripts when #+INFOJS_OPT: is empty.
Thanks to Diez B. Roggisch for reporting this.
2014-04-22 10:41:56 +02:00
0f1064a363
Merge branch 'master' of orgmode.org:org-mode
2014-04-22 08:46:22 +02:00
28b038e470
Merge branch 'maint'
2014-04-22 08:03:59 +02:00
162f8867c9
org.el (org-mode): Use `org-*-element' functions again
...
* org.el (org-mode): Use `org-*-element' functions for C-M-a
and C-M-e but fix C-M-e.
2014-04-22 08:03:44 +02:00
9ca840a501
Revert "org.el (org-mode): Use `org-back-to-heading' and `org-end-of-subtree' for C-M-a and C-M-e"
...
This reverts commit 47e456d8a6
2014-04-22 08:02:05 +02:00
a61417f541
org-effectiveness.el (org-effectiveness-plot): fix change of year
...
* org-effectiveness.el (org-effectiveness-plot): fix change of year
2014-04-22 03:56:56 +02:00
903bf2b12c
Merge branch 'master' of orgmode.org:org-mode
2014-04-22 03:29:34 +02:00
60e1331ab7
org-license-el (org-license-gfdl): Fix year.
...
* (org-license-gfdl): replace 2013 by (format-time-string "%Y")
2014-04-22 03:27:51 +02:00
03876f116d
Merge branch 'maint'
2014-04-21 21:56:44 +02:00
369e3d77d0
org-agenda.el (org-agenda-search-view): Fix tag
...
* org-agenda.el (org-agenda-search-view): Fix tag.
Thanks to Brady Trainor for reporting this.
2014-04-21 21:56:28 +02:00
9a4cc3a21e
Merge branch 'maint'
2014-04-21 19:25:44 +02:00
47e456d8a6
org.el (org-mode): Use `org-back-to-heading' and `org-end-of-subtree' for C-M-a and C-M-e
...
* org.el (org-mode): Use `org-back-to-heading' and
`org-end-of-subtree' for C-M-a and C-M-e.
This partially reverts commit 76fa97922
2014-04-21 19:25:27 +02:00
77d7138322
org-license.el: lacks url in cc-by
2014-04-21 15:16:28 +02:00
4c0a29edec
Merge branch 'maint'
...
Conflicts:
lisp/ox.el
2014-04-21 09:50:10 +02:00
b983048b73
Small documentation improvements
...
* doc/org.texi (The Export Dispatcher): Reformulation.
* lisp/ox.el (org-export-copy-to-kill-ring): Comply to docstrings
standards.
2014-04-21 09:48:17 +02:00
3e401117fd
org.texi: Update documentation
...
* doc/org.texi (The export dispatcher): Update documentation since
`org-export-copy-to-kill-ring' has a different default value.
The change happened in 53aab23e70
2014-04-21 09:44:54 +02:00
99af267738
Merge branch 'maint'
2014-04-21 09:25:22 +02:00
f9c93aaa49
Tiny fix
...
* lisp/org.el (org-sparse-tree): Tiny fix.
2014-04-21 09:24:58 +02:00
881459c6bc
Merge branch 'maint'
2014-04-21 09:22:54 +02:00
2434d3e248
Fix code typo
...
* lisp/org.el (org-sparse-tree): Fix code typo. Small refactoring.
Thanks to Brady Trainor for spotting it.
http://permalink.gmane.org/gmane.emacs.orgmode/85320
2014-04-21 09:19:37 +02:00
b5554077cb
org-clock.el: New function `org-clock-sum-custom'
...
* org-clock.el (org-clock-sum-today): Use `headline-filter'.
Remove interactive form.
(org-clock-display): Change the meaning of prefix argument:
one prefix arg shows today's time; two prefix args show clocks
from a custom range; three prefix args show the total time in
the echo area.
(org-clock-sum-custom): New function.
(org-clock-sum): Remove interactive form.
2014-04-20 15:09:32 +02:00
cea5ab81ea
Merge branch 'master' of orgmode.org:org-mode
2014-04-20 12:19:28 +02:00
Eric Schulte
Bastien Guerry
Nicolas Goaziou
Achim Gratz
David Arroyo Menendez
Aaron Ecay