Commit Graph

11717 Commits

Author SHA1 Message Date
Bastien Guerry 4fd173a187 Merge branch 'maint' 2012-09-26 18:27:45 +02:00
Bastien Guerry a1e645b2be mk/server.mk: Let's use /pkg/daily/ for now 2012-09-26 18:27:27 +02:00
Bastien Guerry 5dc2f6ab37 Merge branch 'maint' 2012-09-26 17:50:36 +02:00
Bastien Guerry 0955505324 mk/server.mk: Add an "archive-contents" target
Based on the proposal by Eric Schulte on the mailing list.
Also use the /var/www/orgmode.org/elpa/ directory as the
place where to store ELPA archives (whether they are further
downloaded to the elpa.gnu.org server or not.)
2012-09-26 17:50:20 +02:00
Bastien Guerry c4688a1437 Allow to compare times using seconds (not days) when `org-agenda-todo-ignore-*' options are not nil
* org.el (org-days-to-time): Make obsolete.
(org-time-stamp-to-now): Rename from `org-days-to-time'.
Allow to compare time-stamps based on seconds.

* org-agenda.el (org-agenda-todo-ignore-time-comparison-use-seconds):
New option to compare time stamps using seconds, not days.
(org-agenda-todo-custom-ignore-p)
(org-agenda-check-for-timestamp-as-reason-to-ignore-todo-item):
Use the new function's name and the new option.

This idea came up while reading Jay McCarthy's blog here:
http://jeapostrophe.github.com/blog/2012/09/19/omnifocus-and-org-mode/
2012-09-26 15:53:06 +02:00
Bastien Guerry 91a7e272b3 org-clock.el: Minor enhancements
* org-clock.el (org-clock-sound): Enhance docstring.
(org-notify): Use the parameter `play-sound' as argument for
`org-clock-play-sound'.
(org-clock-play-sound): New optional argument `clock-sound' to
override `org-clock-sound'.
2012-09-26 15:52:21 +02:00
Bastien Guerry 13092befb6 Merge branch 'maint' 2012-09-26 15:19:04 +02:00
Bastien Guerry c1b6920568 Fix a compiler warning. 2012-09-26 15:18:49 +02:00
Bastien Guerry 8365b738ee org-agenda.el (org-agenda-format-item): Fix initialization of the level text property
* org-agenda.el (org-agenda-format-item): Fix initialization
of the level text property.

Thanks to Daniel Clemente for reporting this problem.
2012-09-26 11:36:04 +02:00
Bastien Guerry ca1467160d Merge branch 'maint' 2012-09-26 11:23:57 +02:00
Bastien Guerry 6634a30772 org-agenda.el (org-agenda-skip): Skip information retrieved from a source block
* org-agenda.el (org-agenda-skip): Skip information retrieved
from a source block.

Thanks to Sébastien Vauban for pointing at this.
2012-09-26 11:23:23 +02:00
Bastien Guerry 1b53c705de org.el: Fix `org-display-outline-path' (see commit 979567)
* org.el (org-format-outline-path): Small docstring
enhancement.
(org-display-outline-path): Fix order or arguments.
2012-09-26 11:06:20 +02:00
Bastien Guerry b50c465c17 Merge branch 'maint' 2012-09-26 10:56:20 +02:00
Bastien Guerry 440b9388d4 ob.el: Reintroduce ":results org" but using "#+BEGIN_SRC org", not "#+BEGIN_ORG"
* ob.el (org-babel-common-header-args-w-values)
(org-babel-insert-result): Reintroduce ":results org" but
using "#+BEGIN_SRC org", not "#+BEGIN_ORG".

* org.texi (results): Update documentation for ":results
drawer" and ":results org".
2012-09-26 10:56:16 +02:00
Bastien Guerry a2408063f9 Merge branch 'maint' 2012-09-26 09:49:26 +02:00
Bastien Guerry 4ebfe4f030 ob.el: Remove "org" the list of predefined values for the ":results" parameter
* ob.el (org-babel-common-header-args-w-values): Remove "org"
the list of predefined values for the ":results" parameter.

This complete the previous fix (commit 203e50b).
2012-09-26 09:49:09 +02:00
Bastien Guerry 60626e7406 Merge branch 'maint' 2012-09-26 09:39:02 +02:00
Bastien Guerry 203e50b89b * ob.el (org-babel-insert-result): Remove support for ":results org"
* ob.el (org-babel-insert-result): Remove support for
":results org".

The insertion of #+BEGIN_ORG was confusing.  You can either use
":results raw" to insert the raw results or ":results drawer" to
wrap them into a :RESULTS: ... :END: drawer.
2012-09-26 09:38:49 +02:00
Bastien Guerry e4a01d0dde ob.el: Deprecate ":results wrap" in favor of ":results drawer"
* ob.el (org-babel-common-header-args-w-values)
(org-babel-insert-result): Deprecate ":results wrap" in favor
of ":results drawer".
2012-09-26 09:23:51 +02:00
Bastien Guerry 1ab3bfb119 Merge branch 'maint' 2012-09-26 08:28:44 +02:00
Bastien Guerry 8fbf78d185 org-crypt.el (org-at-encrypted-entry-p): Fix bug when the check happens before the first headline
* org-crypt.el (org-at-encrypted-entry-p): Fix bug when
the check happens before the first headline.
2012-09-26 08:28:32 +02:00
Bastien Guerry 74c294ac84 Merge branch 'maint' 2012-09-26 08:25:16 +02:00
Bastien Guerry 0b65064961 org-capture.el: Add declarations and check is `org-crypt' is loaded (Fix commit ac6409fe)
* org-capture.el (org-at-encrypted-entry-p)
(org-encrypt-entry, org-decrypt-entry): Declare.
(org-capture-set-target-location): Check whether `org-crypt'
has been loaded.

Thanks to Mike McLean for reporting this.
2012-09-26 08:25:05 +02:00
Carsten Dominik 9795679299 Allow to specify the separator used in an outline path.
* lisp/org.el (org-format-outline-path): New argument SEPARATOR to
specify a string that is inserted between parts of the outline path.
(org-display-outline-path): New argument SEPARATOR, to specify a
string that is inserted between parts of the outline path.
2012-09-26 05:44:27 +02:00
Bastien Guerry ea7baa82c2 Merge branch 'master' of orgmode.org:org-mode 2012-09-26 00:44:22 +02:00
Bastien Guerry 1fa24e89ff Merge branch 'maint' 2012-09-26 00:44:05 +02:00
Bastien Guerry 6ea8cf7f27 org.texi (Column width and alignment): Fix typo
* org.texi (Column width and alignment): Fix typo.

Thanks to Erich Neuwirth for spotting this.
2012-09-26 00:38:32 +02:00
Nicolas Goaziou b40d8f7c73 org-e-html: Fix preamble and postamble
* contrib/lisp/org-e-html.el (org-e-html--build-preamble): Renamed
  from `org-e-html-preamble'.  Properly call user-provided preamble
  function when appropriate.  Refactor code.
(org-e-html--build-postamble): Renamed from `org-e-html-postamble.
  Properly call user-provided preamble function when appropriate.
  Refactor code.
(org-e-html-template): Small refactoring.
(org-e-html--translate): Use :html entries in `org-export-dictionary'
instead of :utf-8.
(org-e-html--build-meta-info): Renamed from `org-e-html-meta-info'.
Add docstring.
(org-e-html--build-style): Renamed from `org-e-html-style'. Add
docstring.
(org-e-html--build-mathjax-config): Renamed from
`org-e-html-mathjax-config'.  Add docstring.
2012-09-25 22:50:00 +02:00
Nicolas Goaziou 5b303c8df3 org-e-html: Fix some variables values, docstrings and customize types
* contrib/lisp/org-e-html.el (org-e-html-scripts): Fix default value.
(org-e-html-style-default): Small fix to indentation.
(org-e-html-content-div): Remove obsolete variable.
(org-e-html-toplevel-hlevel): Fix type.
(org-e-html-postamble-format, org-e-html-preamble-format): Fix
docstring and type.
2012-09-25 22:17:54 +02:00
Bastien Guerry d42349d3cf Merge branch 'maint' 2012-09-25 18:31:06 +02:00
Bastien Guerry 12ed0c3978 org-agenda.el (org-agenda-todo-custom-ignore-p): Fix typo in docstring
* org-agenda.el (org-agenda-todo-custom-ignore-p): Fix typo in docstring.
2012-09-25 18:30:55 +02:00
Bastien Guerry 225714a28b Merge branch 'maint' 2012-09-25 17:30:35 +02:00
Bastien Guerry ac6409feae Allow using an encrypted headline as a capture target.
* org-capture.el (org-capture-finalize): Maybe re-encrypt
the target headline if it was decrypted.
(org-capture-set-target-location): Maybe decrypt the target
headline.

* org-crypt.el (org-at-encrypted-entry-p): New function.

Thanks to Guilherme Gondim for suggesting this.
2012-09-25 17:29:44 +02:00
Bastien Guerry 50091a849e org.el: Add a 'htmlize-link text property to plain and bracket links
* org.el (org-activate-plain-links)
(org-activate-bracket-links): Add a new 'htmlize-link text
property, so that htmlize (> version 1.42) can linkify the
links.

Thanks to Hrvoje Nikšić for suggesting this.
2012-09-25 16:04:51 +02:00
Bastien Guerry 1e6263354e contrib/lisp/htmlize.el: Upgrade to version 1.43 2012-09-25 16:03:28 +02:00
Bastien Guerry 4512f88c3c org.el (org-display-outline-path): Allow a string value for the `as-string' parameter
* org.el (org-display-outline-path): Allow a string value for
the `as-string' parameter.  Such a value will replace the "/"
separator in the output.

Thanks to Sébastien Vauban for triggering this.
2012-09-25 14:47:58 +02:00
Bastien Guerry 9ebf9c169e Merge branch 'maint' 2012-09-25 14:40:49 +02:00
Bastien Guerry 26b9e71f26 org.el (org-options-keywords): Add "STYLE:"
* org.el (org-options-keywords): Add "STYLE:".
2012-09-25 14:40:38 +02:00
Jarmo Hurri 108689550f org-gnus.el: New option to start Gnus with `gnus-no-server'
* org-gnus.el (org-gnus-no-server): New option to start Gnus
using `gnus-no-server'.
(org-gnus-no-new-news): Use the new option.

TINYCHANGE
2012-09-25 11:55:26 +02:00
Bastien Guerry 6781b196aa Merge branch 'maint' 2012-09-25 03:45:27 +02:00
Bastien Guerry eacf3126b7 mk/server.mk: Add COPYING to ELPA archives 2012-09-25 03:45:21 +02:00
Bastien Guerry 35b67a74d7 Merge branch 'master' of orgmode.org:org-mode 2012-09-25 03:43:53 +02:00
Bastien Guerry 044dbf680e org.el (org-display-outline-path): New argument `as-string'
* org.el (org-display-outline-path): New argument `as-string'.

This useful if you want to display the outline path in the
minibuffer like this:

(add-hook 'org-mode-hook
          (lambda() (add-to-list 'mode-line-format
                                 '(:eval (org-display-outline-path nil t t)) t)))
2012-09-25 03:43:41 +02:00
Nicolas Goaziou 31431aefbc org-e-publish: Require appropriate back-ends when publishing
* contrib/lisp/org-e-publish.el (org-e-publish-org-to-latex,
  org-e-publish-org-to-pdf, org-e-publish-org-to-html,
  org-e-publish-org-to-ascii): Require appropriate back-ends.
2012-09-24 22:46:56 +02:00
Nicolas Goaziou 179a5224f6 org-export: Signal an error when back-end isn't registered
* contrib/lisp/org-export.el (org-export-barf-if-invalid-backend): New
  function.
(org-export-as): Signal an error when back-end isn't registered.
2012-09-24 22:35:55 +02:00
Bastien Guerry bf072bd647 Merge branch 'maint' 2012-09-24 19:15:59 +02:00
Bastien Guerry 9aff6ffe8a Add COPYING and fix other related issues.
Mention COPYING in READMEs.
Fix the header of ob-fortran.el (see this fix in Emacs trunk:
http://lists.gnu.org/archive/html/emacs-diffs/2012-09/msg00365.html)
Specify that org-colview-xemacs.el is *not* part of Emacs.
Specify that org-element.el is part of Emacs (prepare the sync.)
Add COPYING in the release (mk/server.mk).
2012-09-24 19:15:42 +02:00
Bastien Guerry 2150a98987 Merge branch 'maint' 2012-09-24 17:59:32 +02:00
Bastien Guerry c92a2a5c4f org-agenda.el (org-agenda-ndays): Fix bug
* org-agenda.el (org-agenda-ndays): Don't make an alias, as
`org-agenda-span' is defined separately.

Thanks to Tassilo for reporting this.
2012-09-24 17:59:23 +02:00
Bastien Guerry 5036388ab9 Merge branch 'maint' 2012-09-24 17:19:39 +02:00