973efcd9c9
Merge branch 'max-sticky-agenda'
2012-04-16 05:25:06 -04:00
3bd1c2e9bf
Added new `org-agenda-filter-by-top-category' command
2012-04-16 03:13:22 -05:00
724b8402e8
org-e-latex: Silence byte-compiler
2012-04-15 12:17:59 +02:00
49f0202516
org-e-latex: Silence byte-compiler
2012-04-15 11:07:17 +02:00
55cdbc422b
org-e-odt: Support for hierarchical numbering of fig, table etc
...
Introduced org-e-odt-enumerate-element &
org-e-odt-display-outline-level for hierarchical numbering.
Don't use org-export-get-ordinal (for now).
Combine org-e-odt-format-label-reference and
org-e-odt-format-label-definition in to a consolidated
org-e-odt-format-label. Lots of related changes.
2012-04-15 01:44:19 +05:30
bc473299f1
safer equality test in org-babel-header-arg-expand
...
* lisp/ob.el (org-babel-header-arg-expand): In new
buffers (char-before) may return nil so use equal rather than =.
2012-04-14 09:32:57 -04:00
7212801808
Merged origin/master into max-sticky-agenda
2012-04-13 18:15:18 -04:00
5e4cffbb06
code-block languages may specify their own headers and values
...
* lisp/ob-R.el (org-babel-header-args:R): Adding values.
* lisp/ob-clojure.el (org-babel-header-args:clojure): Adding values.
* lisp/ob-lisp.el (org-babel-header-args:lisp): Adding values.
* lisp/ob-sql.el (org-babel-header-args:sql): Adding values.
* lisp/ob-sqlite.el (org-babel-header-args:sqlite): Adding values.
* lisp/ob.el (org-babel-combine-header-arg-lists): Combine lists of
arguments and values.
(org-babel-insert-header-arg): Use new combined header argument
lists.
(org-babel-header-arg-expand): Add support for completing-read
insertion of header arguments after ":"
(org-babel-enter-header-arg-w-completion): Completing read insertion
of header arguments
(org-tab-first-hook): Adding header argument completion.
(org-babel-params-from-properties): Combining header argument lists.
* testing/lisp/test-ob.el (ob-test/org-babel-combine-header-arg-lists):
Test the new header argument combination functionality.
2012-04-13 08:43:16 -04:00
36711b05ba
org-export: Fix footnotes export outside parsing scope
...
* contrib/lisp/org-export.el (org-export-get-buffer-attributes):
Function renamed from `org-export-initial-options'.
(org-export-store-footnote-definitions): New function.
(org-export-as): Store footnote definitions at the appropriate place.
It happens twice if buffer gets expanded.
* testing/lisp/test-org-export.el: Add test.
2012-04-13 15:47:13 +02:00
0c302d412c
Add support for creating symbolic links in org-attach
2012-04-12 13:21:05 -05:00
165d34af6a
Revert "Revert "in emails, wrap html and images in a multipart/mixed structure""
...
This reverts commit 3f810ad424
2012-04-12 08:21:05 -04:00
0202817e06
Revert "retain disposition=inline change for images in html mail"
...
This reverts commit e307d08382
2012-04-12 08:21:05 -04:00
256eafe32c
org-e-latex: Properly handle quotes at bol
...
* EXPERIMENTAL/org-e-latex.el (org-e-latex-quotes): Properly handle
quotes at bol.
2012-04-12 12:44:16 +02:00
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
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
43be98cfed
Merge branch 'hotfix'
2012-04-11 13:02:38 +02:00
ac2cb80ec0
orgcard.tex: Fix copyright year.
2012-04-11 13:01:23 +02:00
fe5e004e39
Merge branch 'hotfix'
2012-04-11 12:30:55 +02:00
148e8c7724
Bump to version 7.8.09.
2012-04-11 12:30:40 +02:00
37557ef103
Merge branch 'master' of orgmode.org:org-mode
2012-04-11 10:27:42 +02:00
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
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
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
8c4ccab028
Merge branch 'hotfix'
2012-04-11 01:14:39 +02:00
3523533e50
Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix
2012-04-11 01:14:29 +02:00
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
5adb7638fe
Merge branch 'master' of orgmode.org:org-mode
2012-04-11 00:44:05 +02:00
c836b05084
Merge branch 'hotfix'
2012-04-11 00:43:48 +02:00
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
f42e40d978
Merge branch 'hotfix'
2012-04-10 23:39:16 +02:00
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
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
990558eb21
Merge branch 'hotfix'
2012-04-10 22:26:18 +02:00
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
c8294348ef
Merge branch 'origin-hotfix-7.8.06'
2012-04-10 16:02:16 -04:00
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
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
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
5841dbd5ec
Merge branch 'hotfix'
2012-04-10 20:23:29 +02:00
3ec180b88f
Revert "org-agenda.el: Remove useless prefix argument."
...
This reverts commit 346907b996
2012-04-10 20:23:15 +02:00
4611adac23
Merge branch 'hotfix'
2012-04-10 20:09:33 +02:00
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
d6773457a2
Merge remote-tracking branch 'origin/hotfix-7.8.06'
2012-04-10 22:30:11 +05:30
e1c83760bc
doc/org.texi: Fix compilation error
2012-04-10 22:24:54 +05:30
4f4b817315
Merge branch 'hotfix'
2012-04-10 18:32:54 +02:00
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
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
b05cbf73a0
Revert "org.el: Fix bug when gathering tag completion options."
...
This reverts commit e48d67ed6d
2012-04-10 18:04:28 +02:00
6c67af5627
Revert "org.el: Include `org-tag-alist' in the list for tag completions."
...
This reverts commit acc7a0b2bbhttp://article.gmane.org/gmane.emacs.orgmode/54406
2012-04-10 18:03:39 +02:00
e8912e1bd8
Merge branch 'hotfix'
2012-04-10 14:33:01 +02:00
Max Mikhanosha
John Wiegley
Nicolas Goaziou
Jambunathan K
Eric Schulte
Bastien Guerry