57f8bbf7ea
Merge branch 'hotfix-7.8.06'
2012-03-28 02:05:43 +02:00
8ab92f8b55
Delete trailing whitespaces in core files.
2012-03-28 02:05:36 +02:00
d0a7d7cddd
Merge branch 'hotfix-7.8.06'
2012-03-28 01:44:56 +02:00
ad3f9322ad
org-ascii.el: Fix escaping of underscores in links.
...
* org-ascii.el (org-export-as-ascii): Fix escaping of
underscores in links.
Thanks to Daniel Dehennin who reported this problem.
2012-03-28 01:44:41 +02:00
d562648f5e
Merge branch 'hotfix-7.8.06'
2012-03-28 01:24:09 +02:00
6b83267f9e
Fix missing parenthesis. *Blush*.
2012-03-28 01:24:02 +02:00
d0ae7ab479
Merge branch 'hotfix-7.8.06'
2012-03-28 01:04:43 +02:00
165cb4610a
Fix bug in the menu and a small change to org-beamer.
...
* org.el: Prevent a bug while defining the menu by requiring
`org-beamer' when necessary.
* org-beamer.el (org-insert-beamer-options-template): Make the
parameter optional since the interactive call defines it.
2012-03-28 01:04:36 +02:00
7686a81c14
New option to format the total time cells.
...
* org-clock.el (org-clock-in-prepare-hook): New option to
format the total time cells.
(org-clocktable-write-default): Use the new option.
2012-03-28 00:49:55 +02:00
122f5fd5b5
Merge branch 'hotfix-7.8.06'
2012-03-27 23:51:00 +02:00
8d74c84962
Use `backward-delete-char' instead of `delete-backward-char' to silent compiler.
...
* org-table.el (orgtbl-self-insert-command): Use
`backward-delete-char' instead of `delete-backward-char' as
this last command gets caught by the compiler which says to
not use it in programs. `backward-delete-char' is just an
alias for `delete-backward-char' which is internally remapped
to `org-delete-backward-char' for optimization purpose.
* org.el (org-self-insert-command): Ditto.
2012-03-27 23:50:52 +02:00
2a94e997f4
Revert "Use `delete-char' instead of `delete-backward-char'"
...
This reverts commit 00040e708chttp://comments.gmane.org/gmane.emacs.orgmode/52717
2012-03-27 23:24:33 +02:00
bd7913c294
Merge branch 'hotfix-7.8.06'
2012-03-27 23:08:52 +02:00
83af2107de
org-latex.el: Bugfix: when `org-export-latex-low-levels' is nil, do not export low levels.
...
* org-latex.el (org-export-latex-subcontent): Bugfix: when
`org-export-latex-low-levels' is nil, do not export low levels.
Thanks to Nick Dokos for spotting this.
2012-03-27 23:08:41 +02:00
30a813c57b
Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06
2012-03-27 17:44:35 +02:00
a4efcc3a39
Merge branch 'origin-hotfix-7.8.06'
2012-03-27 07:12:17 -04:00
dbe4bf805f
fix bug in indented wrapped results insertion
...
* lisp/ob.el (org-babel-insert-result): Fix bug in indented wrapped
results insertion.
* testing/lisp/test-ob.el (test-ob/org-babel-results-indented-wrap):
Test correct indentation behavior.
2012-03-27 07:09:22 -04:00
3d5a3474ca
Merge branch 'hotfix-7.8.06'
2012-03-27 12:31:03 +02:00
acc7a0b2bb
org.el: Include `org-tag-alist' in the list for tag completions.
...
* org.el (org-set-tags): Include `org-tag-alist' in the list
of possible completions, even when there are tags defined in
the buffer.
Thanks to Mike McLean for reporting this.
2012-03-27 12:30:57 +02:00
5fc7b7d138
Merge branch 'hotfix-7.8.06'
2012-03-27 12:22:04 +02:00
410dd12d89
org-mime.el: Set `org-export-with-LaTeX-fragments' correctly.
...
* org-mime.el (org-mime-htmlize): Set
`org-export-with-LaTeX-fragments' correctly.
2012-03-27 12:21:56 +02:00
c760f9be7e
Merge branch 'hotfix-7.8.06'
2012-03-27 12:10:31 +02:00
d069301060
org.el: Don't add a column when there is only one tag offered for completion.
...
* org.el (org-set-tags): Don't add a column when there is only
one tag offered for completion.
2012-03-27 12:10:14 +02:00
647396464d
org.el: Include tags from `org-tag-alist' when completing with the TAB key.
...
* org.el (org-fast-tag-selection): Include tags from
`org-tag-alist' when completing with the TAB key.
Thanks to Mike McLean for reporting this problem.
2012-03-27 12:09:02 +02:00
ef0ab2fc4c
Merge branch 'hotfix-7.8.06'
2012-03-26 23:02:35 +02:00
f2598e41ac
Fix commit 6632ea.
2012-03-26 23:02:28 +02:00
2ae78a5dab
Merge branch 'hotfix-7.8.06'
2012-03-26 22:56:12 +02:00
4637de726c
Revert "org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline."
...
This reverts commit 6632ea95d3
2012-03-26 22:56:02 +02:00
e7a3dd3750
Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06
2012-03-26 22:40:46 +02:00
2120c372e5
Merge branch 'hotfix-7.8.06'
2012-03-26 22:39:52 +02:00
3c57eb297b
doc: Fix pdflayout.sty to produce orgcard_letter.pdf correctly.
...
Thanks to David Niemi for the fix.
2012-03-26 22:37:59 +02:00
d1ed590320
doc: Fix pdflayout.sty to produce orgcard_letter.pdf correctly.
...
Thanks to David Niemi for the fix.
2012-03-26 22:37:29 +02:00
5c54e1eeda
Merge branch 'hotfix-7.8.06'
2012-03-26 22:28:49 +02:00
e92ae2e762
org.el (org-display-inline-images): Honor the ̀beg' parameter.
...
* org.el (org-display-inline-images): Honor the ̀beg' parameter.
TINYCHANGE
2012-03-26 22:28:16 +02:00
6632ea95d3
org-latex.el: Don't insert a linebreak when itemizing a subtree that is just a headline.
...
* org-latex.el (org-export-latex-subcontent): Don't insert a
linebreak when itemizing a subtree that is just a headline.
Thanks to Richard Stanton for spotting this.
2012-03-26 19:40:05 +02:00
2aa20d6f44
Merge branch 'origin-hotfix-7.8.06'
2012-03-26 13:35:11 -04:00
959ed59861
Merge branch 'hotfix-7.8.06'
2012-03-26 19:55:18 +02:00
665fba0c2c
removed extra []s when parsing inline call_foo lines
...
* lisp/ob-lob.el (org-babel-lob-get-info): Removed extra []s when
parsing inline call_foo lines.
2012-03-26 13:34:19 -04:00
9602e1cb38
org-collector.el: Don't narrow to subtree when collecting properties on the whole buffer.
...
* org-collector.el (org-dblock-write:propview): Don't narrow
to subtree when collecting properties on the whole buffer.
TINYCHANGE
2012-03-26 17:24:26 +02:00
50e766a79b
Declare function `org-string-nw-p'.
2012-03-26 17:21:44 +02:00
2ef04872ed
Merge branch 'origin-hotfix-7.8.06'
2012-03-26 07:45:54 -04:00
ab76b8f29e
The maxima command used should be configurable--defaults to maxima-command if defined
...
* lisp/ob-maxima.el (org-babel-maxima-command): The maxima command
used should be configurable (defaults to maxima-command if defined).
(org-babel-execute:maxima): The maxima command used should be
configurable (defaults to maxima-command if defined).
2012-03-26 07:45:40 -04:00
c077d5714c
Merge branch 'origin-hotfix-7.8.06'
2012-03-26 07:39:29 -04:00
4202665f5b
add the local directory to the library search path for C/C++ block compilation
...
* lisp/ob-C.el (org-babel-C-execute): Add the local directory to the
library search path for C/C++ block compilation.
This patch was submitted to the list by Daimrod.
2012-03-26 07:39:14 -04:00
7b172ade00
Merge branch 'origin-hotfix-7.8.06'
2012-03-26 07:20:37 -04:00
1ca7485a88
don't truncate results name on call line execution
...
* lisp/ob.el (org-babel-where-is-src-block-result): Don't truncate
results name on call line execution.
2012-03-26 07:18:31 -04:00
9a8ba56d9e
Merge branch 'hotfix-7.8.06'
2012-03-26 10:28:39 +02:00
76b2943545
Clean up test left over.
2012-03-26 10:27:12 +02:00
3df72679bb
Merge branch 'hotfix-7.8.06' of orgmode.org:org-mode into hotfix-7.8.06
2012-03-25 01:51:11 +01:00
32bbca6be7
Merge branch 'master' of orgmode.org:org-mode
2012-03-25 01:49:58 +01:00
Bastien Guerry
Eric Schulte
Shoji Nishimura