Commit Graph

11808 Commits

Author SHA1 Message Date
Bastien Guerry 222eae4033 Fix error messages: don't use a dot at the end 2012-09-28 17:47:48 +02:00
Bastien Guerry 75820c49de Merge branch 'maint' 2012-09-28 17:21:50 +02:00
Nicolas Goaziou ac25422286 ob-org: By default, export code from Org src blocks
* lisp/ob-org.el (org-babel-default-header-args:org): By default,
  export code from Org src blocks.
2012-09-28 17:21:37 +02:00
Bastien Guerry cbe4cfc99a Merge branch 'maint' 2012-09-28 17:08:46 +02:00
Bastien Guerry 79d3c289da org-e-html.el (org-e-html-final-function): Turn on `html-mode', not `nxml-mode'
* org-e-html.el (org-e-html-final-function): Turn on
`html-mode', not `nxml-mode'.
2012-09-28 17:08:37 +02:00
Bastien Guerry f71db4e509 org-publish.el (org-publish-cache-ctime-of-src): Fix reference to relative symlinks
* org-publish.el (org-publish-cache-ctime-of-src): Delete
the base-dir argument and use (file-name-directory file) to
get the file's directory.
(org-publish-update-timestamp)
(org-publish-cache-file-needs-publishing): Call
`org-publish-cache-ctime-of-src' with only one argument.

Thanks to T.F. Torrey who suggested a fix for this.
2012-09-28 17:07:22 +02:00
Bastien Guerry 16441f6f40 Merge branch 'maint' 2012-09-28 16:51:34 +02:00
Bastien Guerry 807137acdd org.el (org-follow-timestamp-link): Fix bug when using sticky agenda
* org.el (org-follow-timestamp-link): Fix bug when using
sticky agenda.  Add a docstring.

Thanks to Christoph Lange for reporting this.
2012-09-28 16:51:21 +02:00
Bastien Guerry b56acb69ff org-fixup.el (org-make-local-mk): Fix typo in comment
* org-fixup.el (org-make-local-mk): Fix typo in comment.
2012-09-28 16:40:00 +02:00
Bastien Guerry 132414b11c Merge branch 'maint' 2012-09-28 16:37:34 +02:00
Bastien Guerry 3a11d64d23 org-agenda.el (org-agenda-sticky): Don't use a function to set. Add a :version string.
* org-agenda.el (org-agenda-sticky): Don't use a function to
set.  Add a :version string.
2012-09-28 16:37:23 +02:00
Memnon Anon 213e2934c1 Add a link to documentation
* doc/org.texi (Tracking your habits): Point to the
  "Tracking TODO state changes" section.

As suggested by Jonas Stein.

TINYCHANGE
2012-09-28 15:51:56 +02:00
Bastien Guerry 2bd95b6bfc Merge branch 'maint' 2012-09-28 10:05:20 +02:00
Bastien Guerry c173b19b05 mk/server.mk: Use /elpa/ instead of /pkg/daily/ 2012-09-28 10:05:10 +02:00
Bastien Guerry acca5ddbae Merge branch 'maint' 2012-09-28 08:29:47 +02:00
Bastien Guerry e8b45bb947 Rebind `org-agenda-priority' to `C-c ," in agenda mode (`C-u C-c ,' now shows priority)
* org.el (org-priority): Use a new argument to show priority
instead of setting it.
(org-show-priority): New function to show priority both in
normal Org buffers and in Org Agenda buffers.
(org-speed-commands-default): Use "," as a speed command for
setting priority.

* org-agenda.el (org-agenda-mode-map): Bind
`org-agenda-priority' to `C-c ,' as it was before.
(org-agenda-show-priority): Delete.
(org-agenda-priority): Use a new argument to show priority
instead of setting it.

Thanks to Robert Horn for triggering this change.
2012-09-28 08:29:38 +02:00
Bastien Guerry d35c95a358 org.el (org-format-outline-path): Fix bug: add the separator string after the prefix
* org.el (org-format-outline-path): Fix bug: add the separator
string after the prefix.
2012-09-28 08:07:42 +02:00
Bastien Guerry 5ba6bd859a Merge branch 'maint' 2012-09-28 00:13:15 +02:00
Bastien Guerry b04e66a6f8 Merge branch 'master' of orgmode.org:org-mode 2012-09-28 00:13:04 +02:00
Bastien Guerry 001d2d92ba Rename some functions and move some hooks.
* org.el (org-font-lock-hook, org-set-font-lock-defaults): Add
a docstring.
(org-display-inline-remove-overlay): Rename from
`org-display-inline-modification-hook'.
(org-speed-command-activate): Rename from
`org-speed-command-default-hook'.
(org-babel-speed-command-hook): Rename from
`org-babel-speed-command-activate'.

* org-agenda.el (org-agenda-update-agenda-type): Rename from
`org-agenda-post-command-hook'.
(org-agenda-mode): Use the new name.
(org-agenda-post-command-hook): Define as obsolete function.

* org-lparse.el (org-lparse): Temporarily activate the hooks
needed for the ODT conversion.
(org-lparse-preprocess-after-blockquote): Rename from
`org-lparse-preprocess-after-blockquote-hook'.
(org-lparse-strip-experimental-blocks-maybe): Rename from
`org-lparse-strip-experimental-blocks-maybe'.
(org-lparse-preprocess-after-blockquote-hook)
(org-lparse-strip-experimental-blocks-maybe-hook): Define as
obsolete functions.
2012-09-28 00:12:53 +02:00
Bastien Guerry 92c8cd487d Merge branch 'maint' of orgmode.org:org-mode into maint 2012-09-27 23:50:02 +02:00
Bastien Guerry b0c5030c85 ob.el (org-babel-insert-result): Comma-escape results inserted with ":results org"
* ob.el (org-babel-insert-result): Comma-escape results
inserted with ":results org".
2012-09-27 23:49:08 +02:00
Bastien Guerry 468a73ea11 org-src.el: Fix bug about C-c C-s'ing in the source editing window
* org-src.el (org-edit-src-code, org-edit-src-exit): Fix bug
about saving the source editing window with the default value
for `org-src-window-setup' (i.e. 'reorganize-frame).
2012-09-27 23:45:34 +02:00
Bastien Guerry e279e98e77 org-src.el (org-src-font-lock-fontify-block): Fix bug: don't fontify the last character
* org-src.el (org-src-font-lock-fontify-block): Fix bug: don't
fontify the last character.
2012-09-27 23:40:28 +02:00
Bastien Guerry 570083d2ad org.el (org-display-inline-images): Search for #+ATTR within the current paragraph
* org.el (org-display-inline-images): Search for #+ATTR within
the current paragraph.
2012-09-27 23:30:52 +02:00
Bastien Guerry 5501df1199 org.el (org-open-at-point): Don't follow timestamp within bracket links
* org.el (org-open-at-point): Don't follow timestamp within
bracket links.
2012-09-27 23:29:01 +02:00
Achim Gratz 4fb4494e18 Merge branch 'maint' 2012-09-27 20:36:50 +02:00
Achim Gratz 418ec0f5e7 mk/server.mk: (hopefully) correct generation of the package description vector
* mk/server.mk: Correct generation of the package description vector.
  Use empty list instead of nil and add the package type "tar".  With
  these changes a local copy of the package directory is recognized
  correctly.  Add local file variable to the package description files
  so that the byte compiler does not try to compile them.
2012-09-27 20:36:08 +02:00
Nicolas Goaziou ee19704a71 org-e-ascii: Fix 1aae9d83bf
* contrib/lisp/org-e-ascii.el (org-e-ascii-filter-paragraph-spacing):
  Only apply variables to contiguous paragraphs.
2012-09-27 19:25:38 +02:00
Nicolas Goaziou 60127b7096 org-e-ascii: Fix docstrings
* contrib/lisp/org-e-ascii.el (org-e-ascii-filter-headline-blank-lines,
  org-e-ascii-filter-paragraph-spacing): Fix docstrings.
2012-09-27 19:13:05 +02:00
Nicolas Goaziou 1aae9d83bf org-e-ascii: Add variables to format paragraphs
* contrib/lisp/org-e-ascii.el (org-e-ascii-indented-line-width,
  org-e-ascii-paragraph-spacing): New variables.
(org-e-ascii-paragraph): Use a new variable.
(org-e-ascii-filter-paragraph-spacing): New function.
2012-09-27 14:53:32 +02:00
Bastien Guerry 1a1d062510 Merge branch 'maint' 2012-09-27 00:54:29 +02:00
Bastien Guerry 453be213ce org-capture.el (org-capture-templates): Fix typo in docstring
* org-capture.el (org-capture-templates): Fix typo in docstring.
2012-09-27 00:54:20 +02:00
Bastien Guerry 92308285b4 Merge branch 'maint' 2012-09-26 23:48:18 +02:00
Michael Brand 2648e3d06b org-id-link-to-org-use-id: Align doc string
* org-id.el (org-id-link-to-org-use-id): Align the doc string to the
changed default.

A leftover of commit 0906e32b.
2012-09-26 23:48:13 +02:00
Bastien Guerry 4f2c79cb49 Merge branch 'maint' of orgmode.org:org-mode into maint 2012-09-26 23:45:04 +02:00
Bastien Guerry 817de8c55c Merge branch 'master' of orgmode.org:org-mode 2012-09-26 23:44:44 +02:00
Bastien Guerry 0992544864 Merge branch 'maint' 2012-09-26 23:44:31 +02:00
Bastien Guerry fdc795bb09 mk/server.mk: Fix echo usage for the orgmode.org server 2012-09-26 23:44:25 +02:00
Achim Gratz fa8d7f3d31 Merge branch 'maint' 2012-09-26 21:36:14 +02:00
Achim Gratz 1653759c25 fix test: BEGIN_ORG / END_ORG has been replaced by BEGIN_SRC org / END_SRC
* testing/lisp/test-ob.el (test-ob/org-babel-remove-result--results-org):
  BEGIN_ORG / END_ORG has been replaced by BEGIN_SRC org / END_SRC.
  Change test comparison template accordingly.

* testing/lisp/test-ob.el (test-ob/org-babel-remove-result--results-*):
  These tests had duplicate definitions, removed the first one of each.
2012-09-26 21:35:34 +02:00
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