Mercurial > emacs
diff lisp/org/org-publish.el @ 97027:adc2dffbdfc3
2008-07-25 Carsten Dominik <dominik@science.uva.nl>
* org-publish.el (org-publish-file): Use the true name of the
file.
* org-jsinfo.el (org-infojs-handle-options): Use :style-extra
instead of :style.
* org-exp.el (org-export-plist-vars)
(org-export-add-options-to-plist): Handle creator setting flag.
(org-export-as-html): Handle attributes also for ftp and mailto
links.
* org-agenda.el (org-agenda-diary-entry)
(org-agenda-execute-calendar-command): Cater for the second
argument of `calendar-cursor-to-date'.
| author | Carsten Dominik <dominik@science.uva.nl> |
|---|---|
| date | Fri, 25 Jul 2008 23:02:16 +0000 |
| parents | 60149c696033 |
| children | e1cc41b9282d |
line wrap: on
line diff
--- a/lisp/org/org-publish.el Fri Jul 25 22:33:59 2008 +0000 +++ b/lisp/org/org-publish.el Fri Jul 25 23:02:16 2008 +0000 @@ -4,7 +4,7 @@ ;; Author: David O'Toole <dto@gnu.org> ;; Maintainer: Bastien Guerry <bzg AT altern DOT org> ;; Keywords: hypermedia, outlines, wp -;; Version: 6.06a +;; Version: 6.06b ;; This file is part of GNU Emacs. ;; @@ -554,6 +554,7 @@ (abbreviate-file-name filename)))) (error "Can't publish file outside of a project"))))) (project-plist (cdr project)) + (ftname (file-truename filename)) (publishing-function (or (plist-get project-plist :publishing-function) 'org-publish-org-to-html)) @@ -565,8 +566,8 @@ (setq tmp-pub-dir (file-name-directory (concat pub-dir - (and (string-match (regexp-quote base-dir) filename) - (substring filename (match-end 0)))))) + (and (string-match (regexp-quote base-dir) ftname) + (substring ftname (match-end 0)))))) (if (listp publishing-function) ;; allow chain of publishing functions (mapc (lambda (f)