From d2697cf11ece73aba9c1ecb55d2765412345c4e2 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Fri, 25 Jul 2008 14:04:26 -0700 Subject: [PATCH] Fix bug with recursive publishing and the publishing directory. This one has haunted us for a long time...... --- ORGWEBPAGE/Changes.org | 2 +- ORGWEBPAGE/index.org | 3 +++ lisp/ChangeLog | 3 +++ lisp/org-publish.el | 5 +++-- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ORGWEBPAGE/Changes.org b/ORGWEBPAGE/Changes.org index 03994ed7d..ee7ca29d5 100644 --- a/ORGWEBPAGE/Changes.org +++ b/ORGWEBPAGE/Changes.org @@ -161,7 +161,7 @@ (the directory structure of the source files is reflected in the index). The default is `tree'. - Thanks to Sebastian Rose for the patch. + Thanks to Manuel Hermenegildo for the patch. * Version 6.05 diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org index c30788f6a..f4a5a2a32 100644 --- a/ORGWEBPAGE/index.org +++ b/ORGWEBPAGE/index.org @@ -72,6 +72,9 @@ the command line....): : git clone git://repo.or.cz/org-mode.git +Some more information about this can be found in the FAQ, under +/How can I keep track of changes in my Org files?/. + ** Alternative distributions There are several alternative distrbutions of Org: diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f86751931..efe464681 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2008-07-25 Carsten Dominik + * org-publish.el (org-publish-file): Make sure the directory match + for the publishing directory works correctly. + * org-agenda.el (org-agenda-execute-calendar-command) (org-agenda-diary-entry): Additional optional argument. diff --git a/lisp/org-publish.el b/lisp/org-publish.el index f239aa2ca..e42cb4ec3 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -554,6 +554,7 @@ See `org-publish-org-to' to the list of arguments." (abbreviate-file-name filename)))) (error "Can't publish file outside of a project"))))) (project-plist (cdr project)) + (ftname (file-truename file-name)) (publishing-function (or (plist-get project-plist :publishing-function) 'org-publish-org-to-html)) @@ -565,8 +566,8 @@ See `org-publish-org-to' to the list of arguments." (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) -- 2.11.4.GIT