Merge branch 'master' of git+ssh://repo.or.cz/srv/git/org-mode

Conflicts:
	lisp/ChangeLog
This commit is contained in:
Carsten Dominik 2009-08-31 08:53:35 +02:00
commit 7792fb837a
2 changed files with 9 additions and 4 deletions

View File

@ -7,6 +7,10 @@
* org-gnus.el (org-gnus-store-link): Restore the linking to a
website.
2009-08-30 Bastien Guerry <bzg@altern.org>
* org-latex.el (org-export-latex-first-lines): Bugfix.
2009-08-29 Carsten Dominik <carsten.dominik@gmail.com>
* org-clock.el (org-clock-modify-effort-estimate): Emit message

View File

@ -1003,10 +1003,11 @@ If BEG is non-nil, it is the beginning of the region.
If END is non-nil, it is the end of the region."
(save-excursion
(goto-char (or beg (point-min)))
(let* ((pt (point))
(end (if (re-search-forward "^\\*+ " end t)
(goto-char (match-beginning 0))
(goto-char end))))
(let* ((pt (point)))
(or end
(and (re-search-forward "^\\*+ " end t)
(setq end (match-beginning 0)))
(setq end (point-max)))
(prog1
(org-export-latex-content
(org-export-preprocess-string