0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-22 07:40:44 +00:00
Commit graph

8393 commits

Author SHA1 Message Date
Bastien Guerry 0c40f479cd org-agenda.el (org-agenda-write): Ask before overwriting an existing file
* org-agenda.el (org-agenda-write): Ask before overwriting an
existing file.

Thanks to Rainer Stengele for suggesting this.
2013-03-01 15:06:28 +01:00
Bastien Guerry 1dfc45554a Merge ox-infojs.el into ox-html.el
* org-pcomplete.el
(pcomplete/org-mode/file-option/infojs_opt): Use
`org-html-infojs-opts-table'.

* ox-html.el (org-html-infojs-opts-table):
(org-html-use-infojs, org-html-infojs-options)
(org-html-infojs-template): Move from ox-jsinfo.el.
Rename using the org-html- prefix.
(org-html-infojs-install-script): Move from ox-infojs.el.

* ox-infojs.el: Delete.

* org.texi (JavaScript support): Update variable names.
2013-03-01 14:26:55 +01:00
Bastien Guerry 136781b6a1 ox-html.el (org-html-section): Fix indentation
* ox-html.el (org-html-section): Fix indentation.
2013-03-01 14:22:09 +01:00
Bastien Guerry cfe1d9a9fc ox-html.el: Fix document structure for org-info.js compatibility.
* ox-html.el (org-html-inner-template): Add the document title
here, within the "content" class, as the org-info.js needs it.
(org-html-template): Don't include the document's title here.
(org-html-format-inlinetask-function): Remove wrong example.

Although counter-intuitive and certainly weird, the
<h1 class="title"> string needs to be within the "content"
div, not before it.  We would need the developer of org-info.js
to update org-info.js to put the title outside of "content".
2013-03-01 13:57:54 +01:00
Nicolas Goaziou 25b5ab8a23 ox-latex: Fix nested markup in TODO keyword defalt format
* lisp/ox-latex.el (org-latex-format-headline-default-function): Use
  declarative shape to nest makup for TODO keywords.  Previous syntax
  generated errors during export.
2013-03-01 11:06:00 +01:00
Nicolas Goaziou ce3e6555d3 ox: Ignore org-mode-hook' and kill-emacs-hook' in asynchronous export
* lisp/ox.el (org-export-async-start): Ignore `org-mode-hook' and
  `kill-emacs-hook'.  The first one has been run in the original
  buffer.  The second is not necessary and can pollute output to
  a temporary buffer (e.g. with `org-clock-persistence-insinuate').
2013-03-01 08:31:39 +01:00
Carsten Dominik 8f3a109a21 Use base buffer for storing export dispatch position
* lisp/ox.el (org-export-dispatch): Make sure the last position marker
  uses the base buffer if there is one.
2013-02-28 12:53:45 +01:00
Bastien Guerry 8e0b4529f7 ob-tangle.el (org-babel-tangle-collect-blocks): Don't collect blocks in commented out headings
* ob-tangle.el (org-babel-tangle-collect-blocks): Don't
collect blocks in commented out headings.

Thansk to the various people who requested this.
2013-02-28 10:25:21 +01:00
Carsten Dominik 9dba62be72 Merge branch 'master' of orgmode.org:org-mode 2013-02-28 09:36:22 +01:00
Carsten Dominik 9c58082c46 Make repeating a subtree-restricted export command remember the subtree
Export commands can be restricted to a specific subtree.  When using a
prefix argument to org-export-dispatch, the restriction did not stick,
i.e. the command would be restricted to whatever note the cursor
happens to be in.  This made it difficult to repeat export of a
subtree while editing it.  This change introduces a new marker and
uses this marker to remember the cursor position of the previous
export command.  So repeating a subtree-restricted command will now
re-export the same subtree, provided you are still in the same
buffer.  To break this connection, just make a new export without
relying on the prefix argument.

* lisp/ox.el (org-export-dispatch-last-position): New variable
  (org-export-dispatch): Save position of cursor at the moment when
  the export command is called.  Restore that position temporarily
  when repeating the previous export command.
2013-02-28 09:35:34 +01:00
Bastien Guerry f9d041f9bf Revert "org.el (org-speed-command-activate): Don't activate speed commands within blocks"
This reverts commit 7c8e854d9c.
2013-02-28 09:35:14 +01:00
Bastien Guerry 96aa12eebc Revert "org.el (org-speed-command-activate): Only forbid in src code blocks"
This reverts commit 8ac66556bb.
2013-02-28 09:35:04 +01:00
Bastien Guerry 11cd659553 Merge branch 'master' of orgmode.org:org-mode 2013-02-28 09:33:51 +01:00
Nicolas Goaziou cbba811a73 ox-html: Do not display title in body-only export
* lisp/ox-html.el (org-html-inner-template): Remove title.
(org-html-template): Add title.
2013-02-28 08:48:43 +01:00
Bastien Guerry 4ba1e40cff ox-latex.el: Improve two docstrings
* ox-latex.el (org-latex-logfiles-extensions)
(org-latex-remove-logfiles): Improve docstrings.
2013-02-28 08:41:57 +01:00
Bastien Guerry 9bc7f70639 Merge branch 'master' of orgmode.org:org-mode 2013-02-28 00:29:31 +01:00
Bastien Guerry ffefa9ed86 org-capture.el (org-capture): Cosmetic fix
* org-capture.el (org-capture): Cosmetic fix.
2013-02-28 00:29:24 +01:00
Bastien Guerry f4fc83ec64 org-protocol.el: Small docstrings enhancements
* org-protocol.el (org-protocol-create-for-org)
(org-protocol-create): Small docstrings enhancements.
2013-02-28 00:28:17 +01:00
Bastien Guerry db750eba28 org-protocol.el (org-protocol-capture): Small docstring fix
* org-protocol.el (org-protocol-capture): Small docstring fix.
2013-02-28 00:24:46 +01:00
Achim Gratz 302d3780ec ob-core: add binding for merged-params to avoid multiple evaluation
* lisp/ob-core.el (org-babel-execute-src-block): Add binding for
  merged-params to avoid multiple evaluation of
  `org-babel-merge-params´.
2013-02-27 23:48:02 +01:00
Achim Gratz 0fcfafe331 ob-core: Rename cache? to cache-p, add binding for cache-current-p
* lisp/ob-core.el (org-babel-execute-src-block): Rename cache? to
  cache-p, add binding for cache-current-p and use it.
2013-02-27 23:48:02 +01:00
Bastien Guerry 8ac66556bb org.el (org-speed-command-activate): Only forbid in src code blocks
* org.el (org-speed-command-activate): Only forbid in src code
blocks.
2013-02-27 23:43:25 +01:00
Bastien Guerry ad5085517f Merge branch 'master' of orgmode.org:org-mode 2013-02-27 23:27:16 +01:00
Bastien Guerry fcd2ca5026 org-mew.el: Add declarations
Thanks to Achim for pointing this.
2013-02-27 23:27:02 +01:00
Nicolas Goaziou a7535ca353 ox: Fix min level computation
* lisp/ox.el (org-export--get-min-level): Ignore footnote section when
  computing minimal headline level.
2013-02-27 23:22:51 +01:00
Bastien Guerry ea6be4d3a8 Merge branch 'maint' 2013-02-27 23:06:11 +01:00
Bastien Guerry 7524ef25ff org-indent.el: Bugfix
* org-indent.el
(org-indent-add-properties): Bugfix: prevent negative value for
`added-ind-per-lvl'.

Thanks to Torsten Bronger for reporting this.
2013-02-27 23:06:03 +01:00
Achim Gratz eee580c8b3 Revert "ob-core.el: Do not ask for confirmation if cached value is current"
Reverting "Fix a typo I introduced while editing Achim's commit 091bf0"
Reverting "ob-core.el: Do not ask for confirmation if cached value is current"

This reverts commit 091bf02514.
2013-02-27 22:10:05 +01:00
Bastien Guerry a002158b9f Merge branch 'maint' 2013-02-27 18:14:16 +01:00
Nicolas Richard 8e22aafe9a Fix b6b509b one more time. 2013-02-27 18:13:48 +01:00
Bastien Guerry 6cc600d074 Merge branch 'maint' 2013-02-27 17:28:38 +01:00
Bastien Guerry 01748861d4 Fix b6b509b again.
Thanks to Nicolas Richard for reporting this.
2013-02-27 17:28:33 +01:00
Bastien Guerry 692f053d80 Merge branch 'maint' 2013-02-27 14:49:46 +01:00
Bastien Guerry c8c26c8e19 Enhance the fix implemented in 41882a99
* org.el (org-mode): Add `org-fix-ellipsis-at-bol' to
`isearch-mode-end-hook' so that any isearch fixes the problem with
ellipsis on the first line.
(org-fix-ellipsis-at-bol): New defsubst.
(org-show-context, org-isearch-end): Use it.
2013-02-27 14:49:30 +01:00
Bastien Guerry c8c991e049 org-agenda.el (org-agenda-deadline-leaders): New formatting string for past deadlines
* org-agenda.el (org-agenda-deadline-leaders): New formatting
string for past deadlines.
(org-agenda-scheduled-leaders): Small change.
(org-agenda-get-deadlines): Use the new formatting string.

Thanks to Sébastien Vauban who suggested this idea and proposed
a preliminary patch for it.
2013-02-27 14:29:46 +01:00
Bastien Guerry bdce4dbf9b Fix a typo I introduced while editing Achim's commit 091bf0
Thanks to Achim for reporting this!
http://orgmode.org/cgit.cgi/org-mode.git/commit/?id=091bf0
2013-02-27 13:29:23 +01:00
Bastien Guerry 936f13c629 Merge branch 'master' of orgmode.org:org-mode 2013-02-27 13:27:56 +01:00
Nicolas Goaziou 8506223b27 Fix function declaration 2013-02-27 10:36:07 +01:00
Bastien Guerry 0284bc9d4d ob-lob.el (org-babel-lob-execute): Rename cache? to cache-p
* ob-lob.el (org-babel-lob-execute): Rename cache? to cache-p.

Thanks to Achim for pointing this.
2013-02-27 10:24:04 +01:00
Bastien Guerry 7c8e854d9c org.el (org-speed-command-activate): Don't activate speed commands within blocks
* org.el (org-speed-command-activate): Don't activate speed
commands within blocks.

Thanks to Sébastien Vauban for reporting this.
2013-02-27 10:22:20 +01:00
Nicolas Goaziou c086ea0832 Fix infloop when user provides a wrong value for `org-highlight-latex-and-related'
* lisp/org.el (org-do-latex-and-related): Fix infloop when user
  provides a wrong value for `org-highlight-latex-and-related'. In
  this case, `org-latex-and-related-regexp' is the empty string and
  generates an infloop since matching it doesn't move point.
2013-02-27 10:00:40 +01:00
Achim Gratz 091bf02514 ob-core.el: Do not ask for confirmation if cached value is current
* ob-core.el (org-babel-execute-src-block): Do not run
`org-babel-confirm-evaluate´ if source block has a cache and the
cache value is current (there is no evaluation involved in this
case).
2013-02-27 09:44:27 +01:00
Bastien Guerry 72cc2e99d8 Merge branch 'maint' 2013-02-27 08:46:36 +01:00
Bastien Guerry 5f47cb2b9f Fix commit 41882a99
Thanks to Tassilo Horn for reporting this.
2013-02-27 08:46:26 +01:00
Nicolas Goaziou 86563e0119 org-element: OPTIONAL_TITLE becomes ALT_TITLE property
* lisp/org-element.el (org-element-headline-parser):
  Rename :optional-title into :alt-title.
* lisp/ox.el (org-export-get-alt-title): Renamed from
  `org-export-get-optional-title'.
* lisp/ox-ascii.el (org-ascii--build-title): Apply name change.
* lisp/ox-html.el (org-html--format-toc-headline): Apply name change.
* lisp/ox-latex.el (org-latex-headline): Apply name change.
* lisp/ox-texinfo.el (org-texinfo--get-node,
  org-texinfo--generate-menu-items): Apply name change.
* testing/lisp/test-ox.el: Update tests.
* doc/org.texi (Table of contents): Update documentation.
2013-02-27 00:03:59 +01:00
Nicolas Goaziou bb45dd1074 Fix function declaration 2013-02-26 23:47:07 +01:00
Nicolas Goaziou 677433d9b4 ox: Fix bug where properties read from setupfile overwrite previous properties
* lisp/ox.el (org-export--get-inbuffer-options): Remove an optional
  argument.  Rewrite function.  Properties read from a setupfile do
  not overwrite anymore previously computed properties.
(org-export-get-environment): Apply changes to previous function.
* lisp/org.el (org-create-formula--latex-header): Apply arity change
  from `org-export--get-inbuffer-options'.
* testing/lisp/test-ox.el: Add test.
* testing/examples/setupfile.org: New file.
2013-02-26 23:35:36 +01:00
Tokuya Kameshima 7604fe1e80 org-mew.el: Major enhancement
* org-mew.el (org-mew-inbox-folder, org-mew-use-id-db)
(org-mew-subject-alist, org-mew-capture-inbox-folders)
(org-mew-capture-guess-alist): New options.
(org-mew-store-link, org-mew-open): Rewrite.
(org-mew-folder-name, org-mew-follow-link)
(org-mew-folder-eixsts-p, org-mew-get-msgnum)
(org-mew-open-by-message-id, org-mew-search, org-mew-capture)
(org-mew-capture-guess-selection-keys): New functions.
2013-02-26 23:28:58 +01:00
Bastien Guerry 78c4199310 Merge branch 'maint'
Conflicts:
	lisp/org.el
2013-02-26 22:45:41 +01:00
Bastien Guerry 41882a99d3 Fix a longstanding issue with ellispsis on top of the window
* org.el (org-show-context): Remove useless catch.  Make sure the
top of the window is a visible headline.
* org.el (org-activate-plain-links): Remove unused catch.

* org-macs.el (org-get-alist-option): Return nil, not (nil), so
that `org-show-context' DTRT.

Thanks to Samuel Wales for his patience in reporting this.
2013-02-26 22:45:04 +01:00
Bastien Guerry ebe0fbd6a8 Merge branch 'maint' 2013-02-26 22:02:25 +01:00
Bastien Guerry 2b13d090d1 org.el (org-imenu-get-tree): Fix bug when matching against empty headlines
* org.el (org-imenu-get-tree): Fix bug when matching against empty
headlines.

Thanks to Jambunathan for reporting this.
2013-02-26 22:02:13 +01:00
Bastien Guerry 5bdb84ba74 org.el: Add :version and :package-version to `orgstruct-heading-prefix-regexp' 2013-02-26 18:23:53 +01:00
Bastien Guerry 3ee229dcd1 Merge branch 'master' of orgmode.org:org-mode 2013-02-26 18:21:40 +01:00
Bastien Guerry 295b0ba5d1 Bump :version to "24.4" and add :package-version.
The options updated are those who won't be in Emacs 24.3.
2013-02-26 18:21:28 +01:00
Christopher Schmidt ff92e688dd org.el: Rebind structure-related variables within org-run-like-in-org-mode
* org.el (orgstruct-make-binding): Rebind structure-related
variables within org-run-like-in-org-mode.
2013-02-26 17:52:32 +01:00
Bastien Guerry f20ae92e88 Merge branch 'maint' 2013-02-26 16:28:36 +01:00
Bastien Guerry 2efbd0f138 org.el (org-overview): Stay on current line
* org.el (org-overview): Stay on current line.

This circumvents a bug in hide-sublevels which displays the
"..." ellipsis on top of the window when hiding levels that
are past the middle of the window---at least this is the
way I could understand the problem.

Thanks to Samuel Wales for reporting the problem, Arun Persaud and
William for creating reproducible recipes, Suvayu Ali, Nick Dokos
and Achim Gratz for further help.
2013-02-26 16:28:30 +01:00
Bastien Guerry 76cca82fc1 Merge branch 'maint'
Conflicts:
	lisp/org.el
2013-02-26 16:14:03 +01:00
Bastien Guerry 95375260e5 Fix commit 83bebfd880 2013-02-26 16:13:39 +01:00
Bastien Guerry 04fd44708a Merge branch 'maint' 2013-02-26 15:14:42 +01:00
Bastien Guerry 6042e93fa4 org.el (org-map-entries): Fix docstring
* org.el (org-map-entries): Fix docstring.

Thanks to Christopher Schmidt for reporting this.
2013-02-26 15:14:37 +01:00
Bastien Guerry 889d671277 Fix typo. 2013-02-26 14:37:05 +01:00
Bastien Guerry de73b35909 Merge branch 'maint'
Conflicts:
	contrib/oldexp/org-exp.el
	lisp/org.el
2013-02-26 14:36:36 +01:00
Bastien Guerry 83bebfd880 Use org-autoload' instead of autoload'. 2013-02-26 14:35:25 +01:00
Bastien Guerry 8f49547aaf Remove top-level autoloads sexps.
These autoloads were erroneously introduced by commit e4c31cf98.
2013-02-26 14:35:01 +01:00
Nicolas Goaziou 58fc1b4bf4 Use `org-latex-compile' when processing formulas with imagemagick
* lisp/ox-latex.el (org-latex-compile): Add an optional argument for
  latex snippet previewing.
* lisp/org.el (org-create-formula-image-with-imagemagick): Use
  `org-latex-compile' instead of rewriting it.
2013-02-26 13:43:48 +01:00
Bastien Guerry 0c9b468545 Merge branch 'maint' 2013-02-26 11:09:06 +01:00
Bastien Guerry 467f7ff9b5 Fix commit b6b509.
Thanks to Sébastien Vauban for reporting this.
2013-02-26 11:08:50 +01:00
Nicolas Goaziou b0fd7a51ee Revert "ox: Use tabulated list mode for asynchronous stack"
This reverts commit a965c06213.
2013-02-26 09:46:02 +01:00
Nicolas Goaziou 36f5aa316f ox-html: Fix stack overflow in regexp matching
* lisp/ox-html.el (org-html-fontify-code): Do not use [^\000] in
  regexps that may match large strings.

Thanks to Kyle Machulis for reporting it.
2013-02-26 00:29:04 +01:00
Nicolas Goaziou ef6c1498b4 Re-introduce #+latex_header value when previewing a LaTeX snippet
* lisp/org.el (org-create-formula--latex-header): New function.
(org-create-formula-image-with-dvipng,
org-create-formula-image-with-imagemagick): Use new function.

This functionality was removed in
0484c5c64d, when clearing out old export
framework from "org.el".
2013-02-26 00:04:05 +01:00
Nicolas Goaziou 367e680582 ox: Change order of retured elements in `org-export-get-previous-element'
* lisp/ox.el (org-export-get-previous-element): Change order of
  retured elements in `org-export-get-previous-element'.
* testing/lisp/test-ox.el: Update test.
2013-02-25 23:17:42 +01:00
Nicolas Goaziou 7cd6fdcd34 org-element: Only allow plain links in links
* lisp/org-element.el (org-element-all-successors): Add `plain-link'
  successor.
(org-element-object-restrictions): Remove `link' within `link'.  Allow
`plain-link' instead.
(org-element-plain-link-successor): New function.
* testing/lisp/test-org-element.el: Add test.

Plain links within links are needed for the following kind of syntax:

  [[http://orgmode.org][file:unicorn.png]]

No other link type is allowed within links.
2013-02-25 22:16:01 +01:00
Nicolas Goaziou 11033a97dc sub/superscript character has to follow a non-blank character
* lisp/org.el (org-match-substring-regexp,
  org-match-substring-with-braces-regexp): Update regexp.
  A sub/superscript cannot start anymore at the beginning of the line
  or after a space.
2013-02-25 21:53:14 +01:00
Nicolas Goaziou e024beaa7e org-element: Refactor object parsing
* lisp/org-element.el (org-element--get-next-object-candidates):
  Rewrite function to simplify algorithm.
(org-element-context, (org-element--parse-elements)): Apply
changes.
* lisp/org.el (org-fill-paragraph): Apply changes.
2013-02-25 21:52:54 +01:00
Jonathan Leech-Pepin be9d3bc3a7 ox-texinfo.el: Fix node listing description formatting
* lisp/ox-texinfo.el (org-texinfo--format-menu): Ensure two spaces
  after :: before including description.  Also adjusted logic to
  insert description on desired column (by accounting for added text
  when inserting node.
2013-02-25 12:25:45 -05:00
Christopher Schmidt de5ff236d4 org.el: Bind org-shift* in orgstruct-mode.
* org.el (orgstruct-setup): Bind org-shift*.
2013-02-25 17:12:21 +01:00
Jonathan Leech-Pepin b632d6ff6e ox-texinfo.el: Use :OPTIONAL_TITLE: instead of backend-specific
property

* lisp/ox-texinfo.el (org-texinfo--get-node)
  and (org-texinfo--generate-menu-items): Use :OPTIONAL_TITLE:.
  (org-export-define-backend): Remove :TEXINFO_MENU_TITLE from
  options-alist
2013-02-25 10:59:03 -05:00
Jonathan Leech-Pepin c94cae1ee6 ox-texinfo.el: Fix issue with long headlines and node listings
* lisp/ox-texinfo.el (org-texinfo-node-description-column): New custom
  variable.
  (org-texinfo--format-menu): Use new variable to set column for
  description in node listings.  If the headline extends past this
  column, add the description after the headline.

The default column is 32 as suggested by Thomas S. Dye,
http://article.gmane.org/gmane.emacs.orgmode/66664
2013-02-25 10:44:18 -05:00
Jonathan Leech-Pepin 2a752e4ce1 ox-texinfo.el: Add support for # in info links
* lisp/ox-texinfo.el (org-texinfo-link): Fixed info link exporting to
  recognize # as well as : when finding the info node.

Issue reported by Thomas S. Dye in
http://article.gmane.org/gmane.emacs.orgmode/66655
2013-02-25 10:28:04 -05:00
Jonathan Leech-Pepin d299ae53dd ox-texinfo.el: Add support for @appendix headlines
* lisp/ox-texinfo.el: Included support for appendices.

To include appendices, use a non-nil value for the :APPENDIX: property
of a headline.  This headline will be exported at the appropriate
level as an appendix.
2013-02-25 10:14:53 -05:00
Jonathan Leech-Pepin 696ca23cfb ox-texinfo: Upcase property to comply to changes
* lisp/ox-texinfo.el (org-texinfo-headline): Fix :INDEX property to
  match changes.  Must be uppercase.
2013-02-25 10:04:37 -05:00
Nicolas Goaziou 3049f72f34 ox-html: Attributes specified to a paragraph only apply to first link within
* lisp/ox-html.el (org-html-link, org-html-link--inline-image):
  Attributes specified to a paragraph only apply to first link within.
2013-02-25 14:28:55 +01:00
Rick Frankel 35e914c1d7 Make html exporter respect css-url configuration variable
* lisp/ox-html.el:
  (org-export-define-backend): Add css url option.
  (org-export-htmlized-org-css-url):  Modify docstring and options.
  (org-html--build-style): Include css-url if specified.
2013-02-25 13:00:16 +01:00
Bastien Guerry 4d24f1d383 org-macs.el (org-unmodified): Update comment
* org-macs.el (org-unmodified): Update comment.
2013-02-25 11:47:01 +01:00
Bastien Guerry 372a3ecda8 New compatibility macro `org-with-silent-modifications'
* org-macs.el: Don't define `with-silent-modifications' for
emacsen that don't have it.

* org-compat.el (org-with-silent-modifications): New
compatibility macro.

* org.el (org-refresh-category-properties)
(org-refresh-properties, org-entry-blocked-p)
(org-agenda-prepare-buffers):
* org-indent.el (org-indent-remove-properties)
(org-indent-add-properties):
* org-colview.el (org-columns-display-here)
(org-columns-remove-overlays, org-columns-quit)
(org-columns-edit-value, org-columns-compute-all)
(org-columns-compute, org-agenda-colview-compute):
* org-clock.el (org-clock-sum): Use the compatibility macro
`org-with-silent-modifications' instead of
`with-silent-modifications'.

Thanks to Achim for a preliminary patch.
2013-02-25 11:44:27 +01:00
Bastien Guerry 988240d5fd Merge branch 'master' of orgmode.org:org-mode 2013-02-25 11:21:25 +01:00
Nicolas Goaziou 87c553d268 ox-latex: Fix 309ccd9649
* lisp/ox-latex.el (org-latex-headline): Fix regexp in commit
  309ccd9649.
2013-02-25 11:14:57 +01:00
Bastien Guerry 662cb98684 org.el (org-sort-remove-invisible): Remove emphasis markers
* org.el (org-sort-remove-invisible): Remove emphasis markers.
2013-02-25 11:12:55 +01:00
Nicolas Goaziou 309ccd9649 ox-latex: Do not add optional section name when section is unnumbered
* lisp/ox-latex.el (org-latex-headline): Do not add optional section
  name when section is unnumbered.
2013-02-25 11:03:56 +01:00
Bastien Guerry 1ab872c51e Revert "org.el (org-sort-remove-invisible): Truly returns the visible part of the string"
This reverts commit 30d6dc8baa.
2013-02-25 11:00:55 +01:00
Nicolas Goaziou f26547e320 Fix false positives in `org-in-verbatim-emphasis'
* lisp/org.el (org-in-verbatim-emphasis): Fix false positive when
  point is just after the closing emphasis marker.
2013-02-25 10:53:19 +01:00
Bastien Guerry b5460d5722 Merge branch 'maint' 2013-02-25 10:47:47 +01:00
Tim Burt ad06a946a5 datetree: Recognize year headline with tags as a match
* lisp/org-datetree.el (org-datetree-find-year-create): Also match
headlines with tags.

Change made to fix the problem where a year headline of a
datetree was not matched if it had a tag.  The :NOEXPORT: tag
is one useful case that should be matched.

Initial problem observation reported by Jeffrey McBeth on the
org-mode mailing list.

TINYCHANGE
2013-02-25 10:47:36 +01:00
Bastien Guerry 30d6dc8baa org.el (org-sort-remove-invisible): Truly returns the visible part of the string
* org.el (org-sort-remove-invisible): Use defsust.  Do not
only check against invisible links, truly returns the visible
part of the string.

Thanks to François Pinard for suggesting this.
2013-02-25 10:24:29 +01:00
Bastien Guerry 5700a0eb2d Merge branch 'master' of orgmode.org:org-mode 2013-02-25 10:15:49 +01:00
Bastien Guerry 49772f1f26 Remove hidden links when comparing items or entries.
* org.el (org-sort-remove-invisible): Add a docstring.
(org-sort-entries): Remove hidden links when comparing
entries.

* org-list.el (org-sort-list): Remove hidden links when
comparing list items.

Thanks to François Pinard for suggesting this.
2013-02-25 10:15:44 +01:00
Nicolas Goaziou 8838585a42 Do not move point when filling a table
* lisp/org.el (org-fill-paragraph): Do not move point when filling
  a table.
* testing/lisp/test-org.el: Add test.
2013-02-25 10:06:58 +01:00
Nicolas Goaziou 3b3b6fa836 ox-ascii: Ignore empty lines between comments
* lisp/ox-ascii.el (ascii): Add new filter.
(org-ascii-filter-comment-spacing): New function.
2013-02-25 09:19:07 +01:00
Bastien Guerry 3a0e559ad9 ox-html.el (org-html-headline): Fix typo
* ox-html.el (org-html-headline): Fix typo.

Thanks to Rick Frankel for reporting this.
2013-02-24 19:42:12 +01:00
Bastien Guerry 082023f833 ox-html.el (org-html-format-headline--wrap): Cosmetic change
* ox-html.el (org-html-format-headline--wrap): Cosmetic
change.
2013-02-24 19:25:58 +01:00
Bastien Guerry bd4750f24a Merge branch 'maint'
Conflicts:
	lisp/org-clock.el
	lisp/org.el
2013-02-24 19:19:01 +01:00
Bastien Guerry ac44a7af06 Move `org-at-clock-log-p' from org-clock.el to org.el
* org.el (org-at-clock-log-p): Delete.
* org-clock.el (org-at-clock-log-p): Move here.
2013-02-24 19:16:33 +01:00
Eric Schulte f51fd88554 Return expanded code on programmatic calls
* lisp/ob-core.el (org-babel-expand-src-block): Return value of expanded
  code block on non-interactive calls.
2013-02-24 09:50:46 -07:00
Eric Schulte f30866b03b Customizable wrapper for variables in perl code
* lisp/ob-perl.el (org-babel-perl-var-wrap): Customizable wrapper for
  variables in perl code.
  (org-babel-perl-var-to-perl): Use said wrapper.
2013-02-24 09:50:46 -07:00
Nicolas Goaziou ebf13a39fc ox-latex: Remove non-existent TOC value
* lisp/ox-latex.el (org-latex-keyword): Remove "figures" value.
2013-02-24 16:26:45 +01:00
Nicolas Goaziou eb51080c54 ox-ascii: Fix docstring
* lisp/ox-ascii.el (org-ascii--list-tables): Fix docstring.
2013-02-24 16:16:54 +01:00
Nicolas Goaziou 9e7c30ea3d ox-html: Fix code typo in 1fd83e0487
* lisp/ox-html.el (org-html--format-toc-headline): Fix function name.
2013-02-24 16:03:58 +01:00
Nicolas Goaziou 1fd83e0487 ox-html: Add list of listings and list of tables
* lisp/ox-html.el (org-html-toc, org-html--toc-text): Change to
  docstring.
(org-html-list-of-listings, org-html-list-of-tables): New functions.
(org-html-keyword): Use new functions.
(org-html-src-block): Add an ID attribute when a name is given.
2013-02-24 15:58:47 +01:00
Nicolas Goaziou ca060f7be7 Require 2 blank lines to separate footnote definition
* lisp/org-element.el (org-element-footnote-definition-parser):
  Require 2 blank lines to separate footnote definition.
* lisp/org-footnote.el (org-footnote-at-definition-p): Require 2 blank
  lines to separate footnote definition.
* doc/org.texi: Update documentation for footnotes.
* testing/lisp/test-org-element.el: Update tests.
* testing/lisp/test-org-footnote.el: Add tests.

Footnote definitions can still be separated with other footnote
definitions and headlines. This change allows to have multiple
paragraphs in a footnote definition without resorting to the "\par"
trick.
2013-02-24 14:44:07 +01:00
Nicolas Goaziou a965c06213 ox: Use tabulated list mode for asynchronous stack
* lisp/ox.el (org-export-stack): Rewrite.
(org-export-stack-refresh): Refactor.
(org-export-stack-remove, org-export-stack-view): Apply renaming.
(org-export-stack-mode-map): Use tabulated list map as a basis.
(org-export-stack--generate, org-export-stack--num-predicate): New
function.
2013-02-24 13:51:49 +01:00
Bastien Guerry 398e8af56e Merge branch 'master' of orgmode.org:org-mode 2013-02-24 11:33:34 +01:00
Bastien Guerry d242be2c89 ox-html.el (org-html-format-headline-function): Fix docstring
* ox-html.el (org-html-format-headline-function): Fix docstring.
2013-02-24 10:01:39 +01:00
Nicolas Goaziou a15a657bfb ox: Better return value for `org-export-get-optional-title'
* lisp/ox.el (org-export-get-optional-title): Return regular title
  when no optional title is found.
* lisp/ox-ascii.el (org-ascii--build-title): Apply change to
  `org-export-get-optional-title'.
* lisp/ox-html.el (org-html--format-toc-headline): Apply change to
  `org-export-get-optional-title'.
* lisp/ox-latex.el (org-latex-headline): Apply change to
  `org-export-get-optional-title'.
* testing/lisp/test-ox.el: Add tests.
2013-02-24 09:20:35 +01:00
Bastien Guerry f8e87473d7 ob-sql.el (org-babel-execute:sql): Add header row delimiter for both mysql and postgresql
* ob-sql.el (org-babel-execute:sql): Add header row delimiter
for both mysql and postgresql.

Thanks to Daniel for reporting this.
2013-02-24 09:15:02 +01:00
Bastien Guerry 109f7314a3 org.el (org-agenda-prepare-buffers): Don't use `with-silent-modifications' too early
* org.el (org-agenda-prepare-buffers): Don't use
`with-silent-modifications' too early.

Thanks to J. David Boyd for reporting this and to Florian Beck for
confirming the problem.
2013-02-24 10:49:30 +01:00
Nicolas Goaziou d790fbd489 ox-ascii/ox-latex/ox-html: Make use of optional title in toc
* lisp/ox-ascii.el (org-ascii--build-title): Add an argument.  Use
  optional title when building a toc line.
(org-ascii--build-toc): Call `org-ascii--build-title' with appropriate
arguments.
* lisp/ox-latex.el (org-latex-headline): Use optional title for table
  of contents.
* lisp/ox-html.el (org-html--toc-text): Renamed from
  `org-html-toc-text'.  Add docstring.
(org-html--format-toc-headline): Renamed from
`org-html-format-toc-headline'.  Add docstring.  Use optional title if
possible.
(org-html-toc): Add docstring.
2013-02-23 23:58:23 +01:00
Nicolas Goaziou e5a249b327 org-element/ox: Introduce :optional-title property and an accessor
* lisp/org-element.el (org-element-headline-parser): Node
  property :OPTIONAL_TITLE: in a headline will be parsed and stored
  under :optional-title property.
* lisp/ox.el (org-export-get-optional-title): New function.
2013-02-23 22:41:30 +01:00
Nicolas Goaziou a1236b9606 ox-latex: Fix 99d4c8f915
* lisp/ox-latex.el (org-latex-format-headline-default-function): Make
  the variable a function.
2013-02-23 22:41:30 +01:00
Nicolas Goaziou de4669d3b7 ox-publish: No error when resolving external fuzzy links outside publishing
* lisp/ox-publish.el (org-publish-resolve-external-fuzzy-link): No
  error when resolving external fuzzy links outside publishing.  Though
  search option for these links will not be resolved.
2013-02-23 16:26:27 +01:00
Bastien Guerry 43c8aa02cc Use with-silent-modifications' instead of org-unmodified' when it makes sense
* org-macs.el: Add a comment on when to use `org-unmodified'
and when to use `with-silent-modifications'.

* org-colview.el (org-columns-display-here)
(org-columns-remove-overlays, org-columns-quit)
(org-columns-edit-value, org-columns-compute-all)
(org-columns-compute, org-agenda-colview-compute):
* org-clock.el (org-clock-sum):
* org.el (org-refresh-category-properties)
(org-refresh-properties, org-entry-blocked-p)
(org-agenda-prepare-buffers): Use `with-silent-modifications'
instead of `org-unmodified'.

Thanks to Stefan Monnier for reminding me about `with-silent-modifications'!
2013-02-23 14:57:51 +01:00
Bastien Guerry 64aae2fd29 Merge branch 'maint' 2013-02-23 14:42:45 +01:00
Bastien Guerry b6b509bfd4 org.el (org-tsr-regexp-both): Don't activate dates in links
* org.el (org-tsr-regexp-both): Don't activate dates in links.
(org-activate-dates): Change match boundaries according to the
new value of `org-tsr-regexp-both'.

Thanks to Richard Huang for reporting a related issue.
2013-02-23 14:42:11 +01:00
Bastien Guerry b2e38cb030 Merge branch 'master' of orgmode.org:org-mode 2013-02-23 14:37:43 +01:00
Bastien Guerry 8900b27fc8 ox-publish.el (org-publish-sitemap-date-format): Small docstring enhancement
* ox-publish.el (org-publish-sitemap-date-format): Small
docstring enhancement.
2013-02-23 14:37:23 +01:00
Nicolas Goaziou 57fb6ffa4d ox-latex: Set inputenc option according to `org-export-coding-system'
* lisp/ox-latex.el (org-latex-guess-inputenc): Set inputenc option
  according to `org-export-coding-system'.
2013-02-23 14:04:26 +01:00
Bastien Guerry 8ee6c13c7f Fix typo: an headline -> a headline. 2013-02-23 13:47:44 +01:00
Bastien Guerry 99d4c8f915 ox-latex.el (org-latex-format-headline-default-function): New option
* ox-latex.el (org-latex-format-headline-default-function):
New option.
(org-latex-format-headline-function): Use the new option as
the default value.

The rationale here is that most users will expect Org 8.0
to format headlines like Org <8.0 did.  If they want a different
formatting, then they can use `org-latex-format-headline-function'.
2013-02-23 13:40:47 +01:00
Bastien Guerry 5d5e5631ca ox-latex.el (org-latex-toc-command): Don't add vertical space after the table of contents
* ox-latex.el (org-latex-toc-command): Don't add vertical
space after the table of contents.

Let the user decides about such aesthetic issues.
2013-02-23 13:33:36 +01:00
Bastien Guerry 917cc1d516 Merge branch 'master-wip' 2013-02-23 11:48:21 +01:00
Bastien Guerry 82899fa841 Merge org-with-buffer-modified-unmodified' into org-unmodified'
* org.el (org-entry-blocked-p): Use `org-unmodified' instead
of `org-with-buffer-modified-unmodified'.
(org-agenda-prepare-buffers): Fix indentation.

* org-macs.el (org-unmodified): Rename from
`org-with-buffer-modified-unmodified'.
(org-with-buffer-modified-unmodified): Delete.
2013-02-23 11:44:24 +01:00
Nicolas Goaziou 65bacaac73 ox: Fix coding system error
* lisp/ox.el (org-export--generate-copy-script): Clone
  `buffer-file-coding-system' when creating a buffer copy.

This patches makes sure the output will share the same encoding as the
original buffer.
2013-02-23 11:22:58 +01:00
Bastien Guerry ef1bb160c6 ob-python.el: Use a defcustom for two variables.
* ob-python.el (org-babel-python-command): Use a defcustom.
(org-babel-python-mode): Use a defcustom and default to
'python-mode when featured.

Thanks to Andreas Röhler for providing a prelimiary patch.
2013-02-23 10:27:55 +01:00
Achim Gratz 570e0f93dc Replace time-to-seconds´ with org-float-time´
* lisp/org.el (org-current-time): Replace call to obsolete function
  `time-to-seconds´ with a call to compatibility function
  `org-float-time´.

XEmacs 21.5 already has float-time, so we may not need a compatibility
function here depending on what version of XEmacs introduced it and
what is the earliest version that Org is supposed to still support.
2013-02-23 10:20:03 +01:00
Achim Gratz ff064f89c2 Reverting "Fix compiler warning."
This reverts commit da22d29eb2.
2013-02-23 10:10:38 +01:00
Bastien Guerry e9e32173cc Update headers. 2013-02-23 09:56:24 +01:00
Bastien Guerry ceeee88f49 Update header information.
Those three files will be part of Emacs when Org 8.0
will be merged with Emacs trunk.

Thanks to Nick Dokos for pointing this.
2013-02-23 08:59:23 +01:00
Nicolas Goaziou 3e95e859cd ox-html: Handle external fuzzy links
* lisp/ox-html.el (org-html-link): Resolve external links with search
  options like [[file.org::#custom-id]] or
  [[file.org::*headline-search]].

In particular, this allows to resolve completely links produced by
index generation during publishing.
2013-02-23 00:05:10 +01:00
Nicolas Goaziou 93a70ac598 ox-publish: Implement tools to resolve external fuzzy links
* lisp/ox-publish.el (org-publish-collect-numbering,
  org-publish-resolve-external-fuzzy-link): New functions.
(org-publish-org-to): Add new collecting function to final output
filter.  Move index collecting function to the same filter.
(org-publish-collect-index): Called from final output filter.

An external fuzzy link is: [[file.org::*headline search]]
2013-02-23 00:05:10 +01:00
Christopher Schmidt 14df16d931 org.el: Use longest form when translating keys.
* org.el (orgstruct-setup): Use longest form when translating
keys.
2013-02-22 19:50:51 +01:00
Nicolas Goaziou b10e2bde13 export back-ends: Fix leftover downcase :custom-id properties
* lisp/ox-html.el (org-html-format-headline--wrap, org-html-headline):
  Use :CUSTOM_ID, not :custom-id.
* contrib/lisp/ox-deck.el (org-deck-toc): Use :CUSTOM_ID,
  not :custom-id.
2013-02-22 14:51:58 +01:00
Nicolas Goaziou 6c565ec533 org-element: Fix latex environment parsing
* lisp/org-element.el (org-element-latex-environment-parser): Fix
  wrong value for :post-affiliated property when parsing a latex
  environment.
2013-02-22 14:31:05 +01:00
Bastien Guerry d7fe32a0aa org-agenda.el (org-agenda-start-day): Refer to `org-read-date' in the docstring
* org-agenda.el (org-agenda-start-day): Refer to
`org-read-date' in the docstring.

Thanks to Xiao-Yong Jin for suggesting this.
2013-02-22 14:15:17 +01:00
Bastien Guerry e4a8f7b8c1 ox-org.el (org-org-publish-to-org): Autoload
* ox-org.el (org-org-publish-to-org): Autoload.
2013-02-22 13:42:02 +01:00
Bastien Guerry bfa47dcb94 Merge branch 'master' into master-wip 2013-02-22 12:57:16 +01:00
Bastien Guerry 65399674d5 Remove remember support
* org-protocol.el:
* org-bibtex.el: Remove remember support.

* org-clock.el (org-clock-heading-for-remember): Delete.
(org-clock-in): Do not set the heading for remember.

Users are encouraged to migrate their remember templates to
`org-capture-templates' instead of `org-remember-templates'.
See `org-capture-import-remember-templates' on how to ease
the transition.
2013-02-22 11:44:29 +01:00
Nicolas Goaziou 61bf4a5c3f export back-ends: Preserve subsequent blank lines when ignoring comments
* lisp/ox-latex.el (org-latex-property-drawer): Remove function.
* contrib/lisp/ox-groff.el (org-groff-property-drawer): Remove
  function.

This changes ensures that:

  paragraph
  # comment

  another paragraph

will be exported as:

  paragraph

  another paragraph

and not as:

  paragraph
  another paragraph

It only applies on back-end where empty lines are meaningful (e.g. not
html).
2013-02-22 11:43:38 +01:00
Bastien Guerry 6c788fe738 Move org-remember.el to contrib/lisp/ 2013-02-22 11:41:09 +01:00
Bastien Guerry 71c3c12b39 Use `user-error' when moving or modifying the element at point is not possible
* org.el (org-move-subtree-down, org-forward-element)
(org-backward-element):
* org-table.el (org-table-previous-field)
(org-table-move-column, org-table-move-row):
* org-list.el (org-move-item-down, org-move-item-up)
(org-cycle-item-indentation): Use `user-error' when moving or
modifying the element at point is not possible.
2013-02-22 10:31:35 +01:00