Commit Graph

10397 Commits

Author SHA1 Message Date
Eric Schulte e307d08382 retain disposition=inline change for images in html mail
* contrib/lisp/org-mime.el (org-mime-file): Retain disposition=inline
  change for images in html mail.
2012-04-11 09:20:45 -04:00
Eric Schulte 3f810ad424 Revert "in emails, wrap html and images in a multipart/mixed structure"
This reverts commit 718fefa4e3.
2012-04-11 09:18:16 -04:00
Bastien Guerry 43be98cfed Merge branch 'hotfix' 2012-04-11 13:02:38 +02:00
Bastien Guerry ac2cb80ec0 orgcard.tex: Fix copyright year. 2012-04-11 13:01:23 +02:00
Bastien Guerry fd6b2a6b77 orgcard.tex: Fix copyright year. 2012-04-11 13:00:40 +02:00
Bastien Guerry fe5e004e39 Merge branch 'hotfix' 2012-04-11 12:30:55 +02:00
Bastien Guerry 148e8c7724 Bump to version 7.8.09. 2012-04-11 12:30:40 +02:00
Bastien Guerry 37557ef103 Merge branch 'master' of orgmode.org:org-mode 2012-04-11 10:27:42 +02:00
Bastien Guerry c815eca7ad org-ascii.el: Change the underlining characters for headlines of level 1 and 2
* org-ascii.el (org-export-ascii-underline): Change the
default underlining characters for headlines of level 1 and 2.
Also introduce \. as the underline character for headlines of
level 5.

Thanks to Mathias Bauer for suggesting this.
2012-04-11 08:49:49 +02:00
Bastien Guerry 49645b6014 org.texi: State that you can use the d: option by specifying a list of drawers.
* org.texi (Export options): State that you can use the d:
option by specifying a list of drawers.

Thanks to François Pinard for requesting this.
2012-04-11 08:17:53 +02:00
Eric Schulte 718fefa4e3 in emails, wrap html and images in a multipart/mixed structure
* contrib/lisp/org-mime.el (org-mime-file): Mark images included as
  part of html portions as "disposition=inline".
  (org-mime-multipart): When images are present wrap html and images
  in a multipart/mixed structure.
  (org-mime-htmlize): When images are present wrap html and images in
  a multipart/mixed structure.
2012-04-11 00:20:33 -04:00
Bastien Guerry 8c4ccab028 Merge branch 'hotfix' 2012-04-11 01:14:39 +02:00
Bastien Guerry 3523533e50 Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix 2012-04-11 01:14:29 +02:00
Bastien Guerry 56bd9dc552 org-clock.el: Rename `org-task-overrun*' to `org-clock-task-overrun*'.
* org-clock.el (org-clock-task-overrun-text)
(org-task-overrun, org-clock-get-clock-string)
(org-clock-update-mode-line)
(org-clock-notify-once-if-expired): Rename `org-task-overrun'
and `org-task-overrun-text' to `org-clock-task-overrun' and
`org-clock-task-overrun-text' respectively.
(org-task-overrun-text): New alias.
2012-04-11 01:14:21 +02:00
Bastien Guerry 5adb7638fe Merge branch 'master' of orgmode.org:org-mode 2012-04-11 00:44:05 +02:00
Bastien Guerry c836b05084 Merge branch 'hotfix' 2012-04-11 00:43:48 +02:00
Bastien Guerry 7d8c5c66e9 org-table.el: Fix bug about handling remote references as durations.
* org-table.el (org-table-eval-formula): Fix bug about
handling remote references as durations.

Thanks to Sébastien Vauban for reporting this.
2012-04-11 00:43:05 +02:00
Bastien Guerry f42e40d978 Merge branch 'hotfix' 2012-04-10 23:39:16 +02:00
Bastien Guerry 9586c880b7 org-pcomplete.el: Fix bug in `pcomplete/org-mode/file-option'.
* org-pcomplete.el (pcomplete/org-mode/file-option): Fix bug
in `pcomplete/org-mode/file-option'.

Before this fix, completing #+ATTR worked only once, as
`org-additional-option-like-keywords' was modified.
2012-04-10 23:39:09 +02:00
Bastien Guerry dbd8745c29 Fix bug in org-pcomplete.el.
* org-pcomplete.el (org-thing-at-point): Also match line
options like LATEX_CLASS when pcompleting from LATEX_.
2012-04-10 23:37:12 +02:00
Bastien Guerry 990558eb21 Merge branch 'hotfix' 2012-04-10 22:26:18 +02:00
Bastien Guerry bfe8ec1fce org-agenda.el: Fix inconsistency in `org-agenda-filter-apply' for category filters.
* org-agenda.el (org-agenda-filter-make-matcher)
(org-agenda-filter-apply): Allow filtering entries out by
category.  Using `C-u <' from the agenda view will redisplay
the agenda without entries from categories of the current
line.

Thanks to John Wiegley for pointing this out.
2012-04-10 22:25:53 +02:00
Eric Schulte c8294348ef Merge branch 'origin-hotfix-7.8.06' 2012-04-10 16:02:16 -04:00
Nicolas Goaziou 97d2db4867 org-element: Fix interpretation of affiliated keywords
* contrib/lisp/org-element.el (org-element-interpret--affiliated-keywords):
  Fix interpretation of affiliated keywords.
(org-element-interpret-data): If no `:post-blank' property is
specified, assumed there is no blank line or whitespace after the
element or object.
* testing/lisp/test-org-element.el: Add a test.
2012-04-10 23:53:11 +02:00
Eric Schulte 6c1b38182b better wrapping of main C function
Thanks to Dov Grobgeld for pointing out this fix.

* lisp/ob-C.el (org-babel-C-ensure-main-wrap): Add an explicit return
  to automatically generated main methods.
2012-04-10 16:01:54 -04:00
Jambunathan K bb291df296 org-e-odt: Handle caption/label for src blocks.
Add Listing-related entries to OrgOdtContentTemplate.xml,
OrgOdtStyles.xml.
2012-04-11 01:04:31 +05:30
Bastien Guerry 5841dbd5ec Merge branch 'hotfix' 2012-04-10 20:23:29 +02:00
Bastien Guerry 3ec180b88f Revert "org-agenda.el: Remove useless prefix argument."
This reverts commit 346907b996.
2012-04-10 20:23:15 +02:00
Bastien Guerry 4611adac23 Merge branch 'hotfix' 2012-04-10 20:09:33 +02:00
Bastien Guerry 346907b996 org-agenda.el: Remove useless prefix argument.
* org-agenda.el (org-agenda-filter-by-category): Remove
useless prefix argument.

Thanks to John Wiegley for spotting this.
2012-04-10 20:09:28 +02:00
Jambunathan K d6773457a2 Merge remote-tracking branch 'origin/hotfix-7.8.06' 2012-04-10 22:30:11 +05:30
Jambunathan K e1c83760bc doc/org.texi: Fix compilation error 2012-04-10 22:24:54 +05:30
Bastien Guerry 4f4b817315 Merge branch 'hotfix' 2012-04-10 18:32:54 +02:00
Bastien Guerry d4ddcbb8b3 Revert "org.el: Include tags from `org-tag-alist' when completing with the TAB key."
This reverts commit 647396464d.
2012-04-10 18:20:04 +02:00
Bastien Guerry 1f80206166 Revert "org.el (org-fast-tag-selection): Fix an bug when listing tags for completion."
This reverts commit dca5af369c.
2012-04-10 18:10:30 +02:00
Bastien Guerry b05cbf73a0 Revert "org.el: Fix bug when gathering tag completion options."
This reverts commit e48d67ed6d.

This commit doesn't take care of tag groups.
2012-04-10 18:04:28 +02:00
Bastien Guerry 6c67af5627 Revert "org.el: Include `org-tag-alist' in the list for tag completions."
This reverts commit acc7a0b2bb.

See http://article.gmane.org/gmane.emacs.orgmode/54406
2012-04-10 18:03:39 +02:00
Bastien Guerry e8912e1bd8 Merge branch 'hotfix' 2012-04-10 14:33:01 +02:00
Jérémie Courrèges-Anglas 1e12cbdeda Deadlines and scheduling: Fix order in DEADLINE example
* doc/org.texi (Deadlines and scheduling): Fix the example: the DEADLINE
item should come right after the headline.

TINYCHANGE
2012-04-10 14:32:52 +02:00
Bastien Guerry 4a6f76bab8 Merge branch 'hotfix' 2012-04-09 20:48:51 +02:00
Bastien Guerry 6144a83c5d Fix bug in using ̀org-cycle-level' in non-org modes.
* org.el (org-point-at-end-of-empty-headline): Only try to
match ̀org-todo-line-regexp' when the value is non-nil, e.g.
in non-org modes.

Thanks to Jambunathan for bringing this up.
2012-04-09 20:48:43 +02:00
Bastien Guerry 8ab0dedc4e Merge branch 'hotfix' 2012-04-09 20:06:21 +02:00
Bastien Guerry bf4d38b1fb org-table.el: Fix bug: make sure references to $0 are correctly handled.
* org-table.el (org-table-get-range): Fix bug: make sure
references to $0 are correctly handled.

Thanks to Nick Dokos for the suggestion.

This fixes the computation of values in this table:

| Record   |        Slope |    ConfLower |    ConfUpper |
|----------+--------------+--------------+--------------|
| GISTEMP  | 0.0173837600 | 0.0133209130 | 0.0214466060 |
| HadCrut3 | 0.0158602890 | 0.0118664610 | 0.0198541180 |

See this message/thread:
http://article.gmane.org/gmane.emacs.orgmode/54341
2012-04-09 20:04:22 +02:00
Bastien Guerry a1c3723b05 Merge branch 'hotfix' 2012-04-09 19:20:47 +02:00
Bastien Guerry e6f5c4f1be org.el: Prevent more fontification errors.
* org.el (org-fontify-meta-lines-and-blocks-1): Prevent more
fontification errors.

Thanks to Henning Redestig for reporting this and to Nick Dokos for
digging further.
2012-04-09 19:20:37 +02:00
Bastien Guerry 17443083c0 org-table.el: Add two autoload cookies.
* org-table.el (org-table-recalculate-buffer-tables)
(org-table-iterate-buffer-tables): Add autoload cookie.

Thanks to Sébastien Vauban who suggested adding an autoload
cookie for `org-table-iterate-buffer-tables'.
2012-04-09 17:32:18 +02:00
Bastien Guerry c3cf7b1476 org.el: Exclude tables in src and example blocks.
* org.el (org-table-map-tables): Exclude tables in src and
example blocks.

Thansk to Sebastian for reporting this.
2012-04-09 17:27:32 +02:00
Bastien Guerry 1a8a39d2df Merge branch 'hotfix' 2012-04-09 16:57:19 +02:00
Matt Lundin 275905ed8d Fix hook docstring to reflect renaming of state to org-state.
* lisp/org.el: (org-after-todo-state-change-hook): Fix docstring to
  reflect name change of state to org-state.

The renamed variable can cause user hooks added to
org-after-todo-state-change-hook to break, so it is essential to have
the correct variable name in the docstring.
2012-04-09 16:57:11 +02:00
Matt Lundin 76503ed1b4 Fix org-bbdb anniversaries to work with the new BBDB
* org-bbdb.el (org-bbdb-anniv-extract-date, org-bbdb-make-anniv-hash):
  Fix org-bbdb anniversary functionality to accommodate bbdb 3.x.
  There are two major changes in bbdb 3.x that need to be taken into
  account.  The first is that `bbdb-split' reverses the order of its
  parameters in 3.x.  The second is that `bbdb-record-getprop' is
  replaced by bbdb-record-note in 3.x.
2012-04-09 12:53:08 +02:00