tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity
15,725 Commits 5 Branches 424 Tags 196 MiB
Commit Graph

15725 Commits

Author SHA1 Message Date
Nicolas Goaziou 3034f2895a ox: Fix bug when expanding include keywords 
* lisp/ox.el (org-export--prepare-file-contents): Do not find
  footnotes in non-Org files.

Thanks to Kyle Meyer for reporting it.
http://permalink.gmane.org/gmane.emacs.orgmode/85677
 2014-04-30 09:31:18 +02:00
Bastien Guerry 51893a4e3d Merge branch 'maint' 2014-04-29 13:46:49 +02:00
Bastien Guerry b0f862dfa9 doc/texinfo.tex: Update to stable version 5.2 2014-04-29 13:46:21 +02:00
Bastien Guerry a44cd724c3 Merge branch 'master' of orgmode.org:org-mode 2014-04-29 13:08:33 +02:00
Bastien Guerry 20b70a1716 Merge branch 'maint' 2014-04-29 13:08:23 +02:00
Bastien Guerry e6918b0bb2 Merge branch 'maint' of orgmode.org:org-mode into maint 2014-04-29 13:08:10 +02:00
Bastien Guerry 3104f7de7b org-capture.el (org-capture-fill-template): Fix bug 
* org-capture.el (org-capture-fill-template): Deactivate
region while trying to align tags on the current headline.

Thanks to Alex Kosorukoff for reporting this.
 2014-04-29 13:05:04 +02:00
Nicolas Goaziou ec0eab7fc9 Merge branch 'maint' 2014-04-29 11:37:39 +02:00
Eric Abrahamsen ea50ad41be Fix BBDB link completion 
lisp/org-bbdb.el (org-bbdb-complete-link): Fix link completion with
newer versions of BBDB.

Newer versions of BBDB seem to be returning atomic values from
`bbdb-completing-read-record', we should be prepared for both atoms
and lists.
 2014-04-29 11:36:16 +02:00
Nicolas Goaziou 86a129c597 Fix `org-flag-drawer' 
* lisp/org.el (org-flag-drawer): Do not flag drawer when point is on
  an empty line after it.  When hiding the drawer away, make sure
  point always stays in a visible part of the buffer.

* testing/lisp/test-org.el (test-org/flag-drawer): Add tests.
 2014-04-28 19:41:08 +02:00
Nicolas Goaziou 20e701e1df Merge branch 'maint' 2014-04-28 16:51:59 +02:00
Nicolas Goaziou ae8fd7a139 ox-ascii: Tiny fix 
* lisp/ox-ascii.el (org-ascii--indent-string): Fix regexp to avoid
  stack overflow in regexp matcher on very long lines.
 2014-04-28 16:50:53 +02:00
Marc-Oliver Ihm 233c11df42 Fix for assistant to create index; fix for occur-command 2014-04-26 22:48:09 +02:00
David Arroyo Menendez cacef8fefb org-license.el (org-license-cc-by, org-license-cc-by-nd): Fix some urls. 
* (org-license-cc-by, org-license-cc-by-nd): fix some urls.
 2014-04-26 19:07:15 +02:00
Eric Schulte 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
Bastien Guerry c6d698a5ec Merge branch 'maint' 2014-04-25 09:28:43 +02:00
Bastien Guerry fc37d1020a Fix bug introduced in commit fdb4b54e 
Thanks to Leonard Randall for reporting it.
 2014-04-25 09:27:12 +02:00
Nicolas Goaziou 36b497720d Merge branch 'maint' 
Conflicts:
	lisp/org-element.el
 2014-04-23 22:04:20 +02:00
Nicolas Goaziou 94ae862515 org-element: Fix docstring 
* lisp/org-element.el (org-element-timestamp-parser): Fix docstring.
 2014-04-23 22:02:10 +02:00
Nicolas Goaziou 4c40dc65d0 Merge branch 'maint' 2014-04-23 21:55:38 +02:00
Nicolas Goaziou 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
Nicolas Goaziou f05bdc2d39 Merge branch 'maint' 2014-04-23 21:49:47 +02:00
Achim Gratz 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
Nicolas Goaziou 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
David Arroyo Menendez 7bfdadc601 Merge branch 'master' of orgmode.org:org-mode 2014-04-23 20:28:21 +02:00
Bastien Guerry 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
Bastien Guerry 0b0588b45b Merge branch 'master' of orgmode.org:org-mode 2014-04-23 09:50:41 +02:00
Bastien Guerry 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
Bastien Guerry 51fed2bd9b Merge branch 'maint' 2014-04-23 08:11:45 +02:00
Bastien Guerry 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
Aaron Ecay 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
Aaron Ecay 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
Aaron Ecay 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
Bastien Guerry 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
Bastien Guerry 977b611250 Merge branch 'maint' 2014-04-22 15:24:28 +02:00
Bastien Guerry 1fa6ccab10 Complete fix 369e3d77 2014-04-22 15:24:14 +02:00
Bastien Guerry 69700e1c44 Merge branch 'maint' 2014-04-22 12:09:01 +02:00
Bastien Guerry 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
Bastien Guerry 4346e820b9 README_maintainer: Don't display sub/superscript 2014-04-22 11:53:48 +02:00
Bastien Guerry 38ffaf061e Merge branch 'maint' 
Conflicts:
	lisp/org.el
 2014-04-22 11:18:58 +02:00
Bastien Guerry 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
Bastien Guerry f588f6d884 Merge branch 'maint' 2014-04-22 10:42:10 +02:00
Bastien Guerry 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
Bastien Guerry 0f1064a363 Merge branch 'master' of orgmode.org:org-mode 2014-04-22 08:46:22 +02:00
Bastien Guerry 28b038e470 Merge branch 'maint' 2014-04-22 08:03:59 +02:00
Bastien Guerry 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
Bastien Guerry 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
David Arroyo Menendez 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
David Arroyo Menendez 903bf2b12c Merge branch 'master' of orgmode.org:org-mode 2014-04-22 03:29:34 +02:00
David Arroyo Menendez 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