tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

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

This commit is contained in:
Carsten Dominik 2010-04-04 22:09:06 +02:00
parent d1500f3c8a 1ad6b5b864
commit 4a38efc7e2
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@ -1,3 +1,7 @@
2010-04-04 Bastien Guerry <bzg@altern.org>
* org.el (org-splice-latex-header): Fix typo.
2010-04-04 Carsten Dominik <carsten.dominik@gmail.com>
* org-latex.el (org-export-latex-make-header): Use

2
lisp/org.el
View File

@ -15313,7 +15313,7 @@ at the end. If EXTRA is a string, it is also appended."
(if (string-match "\\[PACKAGES\\]" template)
(setq template (replace-match (or packages "") t t template))
(setq template (concat template "\n" packages)))
(if (and extra (sring-match "\\S-" extra))
(if (and extra (string-match "\\S-" extra))
(concat template "\n" extra)
template)))