Commit Graph

14785 Commits

Author SHA1 Message Date
Nicolas Goaziou e8bafdd04f Optimize hiding all drawers in a buffer
* lisp/org.el (org-cycle-hide-drawers): Make sure each drawer is only
  flagged once.
2013-11-23 09:34:48 +01:00
Nicolas Goaziou 402c310f00 Fix some defconst and docstrings
* lisp/org.el (org-drawer-regexp, org-clock-drawer-start-re,
  org-clock-drawer-end-re): Fix docstring.
(org-clock-drawer-re): Fix value
2013-11-23 09:34:48 +01:00
Nicolas Goaziou cdbdb9ee66 org-inlinetask: Small clean-up 2013-11-23 09:34:48 +01:00
Bastien Guerry b6a1584fa6 Merge branch 'maint' 2013-11-22 22:33:05 +01:00
Nicolas Richard 9ff70abc14 Use key-description on the keys mentionned by the functions defined by
`orgtbl-mode'.
2013-11-22 22:32:50 +01:00
Nicolas Richard a598e9c163 Remove old comment
The comment was introduced (in git) at commit
4be4c56239 ; it refers to a
FIXME located ~40 lines above it. The FIXME was removed in
dc8bc8e392.
2013-11-22 22:32:45 +01:00
Eric Schulte 89a35bc147 inline src block parser set "switches" in info
* lisp/ob-core.el (org-babel-parse-inline-src-block-match): Inline src
  block parser set "switches" in info, otherwise later offset are broken.
2013-11-22 08:28:29 -07:00
Eric Schulte bbcf17b969 set location info parameter for inline src blocks
* lisp/ob-core.el (org-babel-execute-src-block): Set location info
  parameter for inline src blocks.
  (org-babel-get-src-block-info): Set location info parameter for
  inline src blocks.
2013-11-22 08:28:29 -07:00
Eric Schulte 060d79f080 whitespace fixes 2013-11-22 08:28:29 -07:00
Nicolas Goaziou d0e8e57636 Merge branch 'maint' 2013-11-22 12:44:15 +01:00
Nicolas Goaziou 72a81dd06a Fix export of links to attachements (part 2)
* lisp/org.el (org-entry-get): Widen buffer in order to retrieve
  properties, as `org-entry-properties' and
  `org-entry-get-with-inheritance' already do.
2013-11-22 12:42:41 +01:00
Nicolas Goaziou 5ae3a25755 Fix export of links to attachments (part 2)
* lisp/org.el (org-entry-get): Widen buffer in order to retrieve
  a property, as both `org-entry-properties' and
  `org-entry-get-with-inheritance' already do.
2013-11-22 12:39:15 +01:00
Bastien Guerry 0a4d192b79 Merge branch 'maint' 2013-11-22 10:52:53 +01:00
Alexander Vorobiev b88b5d4fd1 org-compat: Support for getting data from Windows clipboard
* lisp/org-compat.el (org-get-x-clipboard): Use w32-get-clipboard-data
to get the clipboard data under Windows.

TINYCHANGE
2013-11-22 10:52:41 +01:00
Nicolas Goaziou 7a726dd137 Merge branch 'maint' 2013-11-22 09:49:17 +01:00
Nicolas Goaziou 23e6c72133 ox-html: Fix TOC entries
* lisp/ox-html.el (org-html--format-toc-headline): Add missing
  headline number in TOC entries.  This fixes commit
  4c94c4d062.
2013-11-22 09:48:25 +01:00
Eric Schulte 336430f6e8 ox-bibtex handle missing ebib or bibtex2html
If ebib is missing then the jump function from org-bibtex-extras.el
  will be used if defined, else no jump function will be used.

  Only call `org-bibtex-process-bib-files' on html export so that
  ox-bibtex may be used for latex export without bibtex2html being
  installed.
2013-11-21 20:59:07 -07:00
Eric Schulte 97e8bc15e7 Revert ""cite" link type in contrib/org-bibtex-extras"
This reverts commit 03c141a00e.
2013-11-21 20:55:53 -07:00
Eric Schulte 4547be972a raise useful error when obe-bibtex-file isn't set 2013-11-21 20:54:59 -07:00
David Arroyo Menendez 7b938d8c2c Merge branch 'master' of orgmode.org:org-mode 2013-11-22 00:12:47 +01:00
Eric Schulte 03c141a00e "cite" link type in contrib/org-bibtex-extras 2013-11-21 14:09:22 -07:00
Nick Dokos 5ea02285ba Ensure that file local variables are set
* lisp/org.el (org-mode): Call `hack-local-variables'
  at the end of `org-mode' to set file local variables.
  Cribbed from `normal-mode'.

Reported by Tom Dye: C-c C-c on e.g an #+OPTIONS line
would lose file local variable settings.
2013-11-21 00:30:05 -05:00
Nicolas Goaziou 92f30ae53c Merge branch 'maint' 2013-11-20 22:02:20 +01:00
Nicolas Goaziou 2dcd6dace9 org.texi: Fix export snippet syntax in ODT backend
* doc/org.texi (Creating one-off styles): Use new export snippet
  syntax.
2013-11-20 22:01:10 +01:00
Bastien Guerry 388dc52c93 Merge branch 'maint' 2013-11-20 19:28:25 +01:00
Thierry Volpiatto 3e87d5893d org-crypt.el: Fix warning
* org-crypt.el (org-encrypt-string, org-encrypt-entry)
(org-decrypt-entry): Fix warning.

TINYCHANGE

epg-context is let-bounded in org-crypt and then epg local set it in
this context.  It should just be set as local var instead of being let
bounded.

See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=15081
2013-11-20 19:26:12 +01:00
Eric Schulte bb97f5cdff rm redundant value/output splitting of lisp blocks
* lisp/ob-lisp.el (org-babel-execute:lisp): The car/cadr are now taken
  previously in the function and need not be taken within the call to
  `org-babel-result-cond'.
2013-11-19 09:06:25 -07:00
David Arroyo Menendez dcddfae281 Merge branch 'master' of orgmode.org:org-mode 2013-11-19 08:13:57 +01:00
Nicolas Goaziou d35233f84a Merge branch 'maint' 2013-11-18 20:49:43 +01:00
Nicolas Goaziou c5aad89f5a Fix export of links to attachements
* lisp/org.el (org-entry-properties): Ignore narrowing when retrieving
  current headline properties.
2013-11-18 19:11:17 +01:00
Achim Gratz 818c821684 org-test: fix macro definitions so that eager macro expansion doesn't fail
* testing/org-test.el (org-test-with-temp-text,
  org-test-with-temp-text-in-file): Correct quoting of macro
  expansion.

Macro arguments must not be used during macro expansion since they are
not available at that time; conversely, bindings established during
macro expansion generally can not be used at macro execution
time (unless un-quoted during expansion).
2013-11-17 21:31:03 +01:00
Paul Sexton 739b2649c7 Updated org-drill to latest version. 2013-11-18 07:18:52 +13:00
Michael Brand 971a3a4e48 Hyperlink: Use url-encode-url for browse-url
* lisp/org.el (org-open-at-point): When available (Emacs 24.3.1) use
`url-encode-url' instead of `org-link-escape-browser'.
2013-11-17 12:00:18 +01:00
David Arroyo Menendez 381a2f14e4 Merge branch 'master' of orgmode.org:org-mode 2013-11-17 11:56:03 +01:00
David Arroyo Menendez 246c8c6637 org-license.el: remove my-org-switch-language function. 2013-11-17 11:54:00 +01:00
Nicolas Goaziou 36c8d8b4d2 org-footnote: Fix dual `org-load-hook' run
* lisp/org-footnote.el (org-footnote-section): Do not require
  `org-element' when initializing the variable, since `org' is not
  provided yet.
2013-11-17 09:52:54 +01:00
Bastien Guerry 9214000c21 Merge branch 'maint'
Conflicts:
	doc/org.texi
2013-11-17 09:17:39 +01:00
Bastien Guerry 4e798549fe Backport Paul's fixes from Emacs trunk (2/2)
See http://article.gmane.org/gmane.emacs.diffs/123123
2013-11-17 09:15:25 +01:00
Bastien Guerry a6210cc9c2 Backport Paul's fixes from Emacs trunk (1/2)
See http://article.gmane.org/gmane.emacs.diffs/123123
2013-11-17 09:12:41 +01:00
Bastien Guerry f8661f7e3d Merge branch 'maint' 2013-11-17 08:47:48 +01:00
Bastien Guerry a3d7cdcd9e Fix version for org-(export-with|use)-sub-superscript
* ox.el (org-export-with-sub-superscripts):
* org.el (org-use-sub-superscripts): Fix version and enhance
docstring again.
2013-11-17 08:46:50 +01:00
Nicolas Goaziou 19d7481665 Change some defcustoms into defconsts
* lisp/org.el (org-clock-string, org-closed-string)
  (org-deadline-string, org-scheduled-string)
  (org-archive-tag, org-comment-string, org-quote-string)
  (org-effort-property, org-latex-regexps): Turn variables into
  constants.
* testing/lisp/test-org-element.el: Update tests.
* testing/lisp/test-ox.el: Update tests.

Also collect all syntax related constants in the same part of the
file.
2013-11-16 21:22:21 +01:00
David Arroyo Menendez d8e149eb76 All functions must start by org-effectiveness 2013-11-16 20:16:03 +01:00
David Arroyo Menendez 2de63285fe Merge branch 'master' of orgmode.org:org-mode 2013-11-16 20:12:58 +01:00
David Arroyo Menendez 19f55fbe27 Accepting canceled and cancelled 2013-11-16 20:12:05 +01:00
Nicolas Goaziou fc95ee2768 org-element: Change to timestamp interpreter
* lisp/org-element.el (org-element-timestamp-interpreter):
  Ignore :raw-value and build timestamp from numeric properties
  instead.
* testing/lisp/test-org-element.el: Update tests.
* testing/lisp/test-ox.el: Update tests.

This change allow to modify and update a timestamp easily without
requiring to reset :raw-value first, which was not intuitive.
2013-11-16 10:18:19 +01:00
Nicolas Goaziou 926bc85861 org-element: Rename a function
* lisp/org-element.el (org-element--cache-shift-positions): Renamed
  from `org-element--shift-positions'.
(org-element--cache-sync): Apply renaming.
2013-11-16 09:53:10 +01:00
Nicolas Goaziou 9676c59547 ox-org: Add "body-only" export
* lisp/ox-org.el (org-org-export-to-org): Add body-only export.
2013-11-16 09:19:22 +01:00
Nicolas Goaziou 4466af5c11 org-element: Fix commit 73d60606bd
* lisp/org-element.el (org-element--cache-sync): Fix commit
  73d60606bd.
2013-11-16 00:33:30 +01:00
Nicolas Goaziou 38a2bd3783 ox-org: Improve keyword handling
* lisp/ox-org.el (org-org-template): New function.
(org-org-keyword): Handle document keywords specially.
2013-11-16 00:20:13 +01:00