From 4905318fb48c16336afeea5e7426741f0ef86894 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 24 Mar 2008 23:11:28 +0100 Subject: [PATCH 1/4] Deleted ORGWEBPAGE/.DS_Store --- ORGWEBPAGE/.DS_Store | Bin 12292 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 ORGWEBPAGE/.DS_Store diff --git a/ORGWEBPAGE/.DS_Store b/ORGWEBPAGE/.DS_Store deleted file mode 100644 index 942082f9d8c8f4e93ac2eac866ef1e64f5cd2af9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12292 zcmeI1&2AGh6orq|AQI9dHb~td%?mVAS+f|Guwc~%?4du<79~t*QmL>&v*ZbQGIs2E z5jfX2l|4U^kXTT09F1=>bC2)!H}N=j0Jwvz(|uqUz=((02NPBu#je}YDua0DA+4hx zIKvyPFvU66EpMF=0TB=Z5fA|p_!kIp&bBh@nfJq0)gmAQ|0Mx?J`_C6meJP1`bP&V zzXYHi^0Y5}&vk&;6w#K^*1>uy+YGA*7o{#PFa51urD-`FW zQ&)I*xH4GPA|L{70=9PF##64?kMKTQzb`Os;k?OjRSiWzRmuJ&AUoEW6bI?u~y(UwlsAlAP|- z`;vPew(D`udd}Bl#ya8WRYzv2_8u-s{FJKejoGD|ai;0X&`pyJb43raOp)fb&&)ca zI8w_rJ6PZ&Iotk^_35auM@GNUhm9AbvU zhM&bx{l;vqV)SYg*};<}{wPs&uljcaYyPbJ*3ih)wD?baew7zW~sW BGH3t* From 363630a4713cfb2d743b0bfe5ee896580ad6c379 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 31 Mar 2008 13:11:17 +0200 Subject: [PATCH 2/4] Bug fixes for org-publish.el. `org-publish-get-base-files-1': get the proper list of files when recursing thru a directory. `org-publish-get-base-files: use the :exclude property to skip both files and directories. This might be refined when the semantic of publishing options gets simpler, but do this for now. `org-publish-project': removed third arg of defalias to avoid compatibility issue for Emacs 22.1. --- ChangeLog | 7 +++++++ lisp/org-publish.el | 13 ++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a1197f62c..4a91fa997 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2008-03-31 Bastien Guerry + + * lisp/org-publish.el (org-publish-get-base-files-1): Bug fix: get + the proper list of files when recursing thru a directory. + (org-publish-get-base-files): Use the :exclude property to skip + both files and directories. + (org-publish-project): Removed third arg of defalias. 2008-03-30 Carsten Dominik diff --git a/lisp/org-publish.el b/lisp/org-publish.el index a2fd0327f..0e70618d9 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -428,11 +428,11 @@ matching the regexp SKIP-DIR when recursiing through BASE-DIR." (fnd (file-name-nondirectory f))) (if (and fd-p recurse (not (string-match "^\\.+$" fnd)) - (if skip-dir (not (string-match match skip-dir fnd)) t)) - (org-publish-get-base-files-1 f recurse skip-file skip-dir) + (if skip-dir (not (string-match skip-dir fnd)) t)) + (org-publish-get-base-files-1 f recurse match skip-file skip-dir) (unless (or fd-p (and skip-file (string-match skip-file fnd))) (pushnew f org-publish-temp-files))))) - (directory-files base-dir t match))) + (directory-files base-dir t (unless recurse match)))) (defun org-publish-get-base-files (project &optional exclude-regexp) "Return a list of all files in PROJECT. @@ -446,7 +446,10 @@ matching filenames." (extension (or (plist-get project-plist :base-extension) "org")) (match (concat "^[^\\.].*\\.\\(" extension "\\)$"))) (setq org-publish-temp-files nil) - (org-publish-get-base-files-1 base-dir recurse match exclude-regexp) + (org-publish-get-base-files-1 base-dir recurse match + ;; FIXME distinguish exclude regexp + ;; for skip-file and skip-dir? + exclude-regexp exclude-regexp) org-publish-temp-files)) (defun org-publish-get-project-from-filename (filename) @@ -602,7 +605,7 @@ Default for INDEX-FILENAME is 'index.org'." ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Interactive publishing functions -(defalias 'org-publish-project 'org-publish "Publish project.") +(defalias 'org-publish-project 'org-publish) ;;;###autoload (defun org-publish (project &optional force) From 23b21bc3ac7d41dda81ce92e3f4026b94f34eb6f Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 31 Mar 2008 13:29:49 +0200 Subject: [PATCH 3/4] Bug fix in `org-publish-get-base-files-1' (again) Honor the :base-extension regexp. --- lisp/org-publish.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/org-publish.el b/lisp/org-publish.el index 0e70618d9..b64acd717 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -430,7 +430,9 @@ matching the regexp SKIP-DIR when recursiing through BASE-DIR." (not (string-match "^\\.+$" fnd)) (if skip-dir (not (string-match skip-dir fnd)) t)) (org-publish-get-base-files-1 f recurse match skip-file skip-dir) - (unless (or fd-p (and skip-file (string-match skip-file fnd))) + (unless (or fd-p ;; this is a directory + (and skip-file (string-match skip-file fnd)) + (not (string-match match fnd))) (pushnew f org-publish-temp-files))))) (directory-files base-dir t (unless recurse match)))) From ff7c35f344ef01fc9acb270d0e3a2a2a94d15c32 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Mon, 31 Mar 2008 13:33:38 +0200 Subject: [PATCH 4/4] Added a link to the git repo in the main webpage. --- ORGWEBPAGE/index.org | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ORGWEBPAGE/index.org b/ORGWEBPAGE/index.org index ae89f6d36..e5cac50c0 100644 --- a/ORGWEBPAGE/index.org +++ b/ORGWEBPAGE/index.org @@ -39,11 +39,17 @@ but may lag a bit behind the website release. * Downloads **** Distribution + Download as [[file:org-5.23a.zip][zip file]] or [[file:org-5.23a.tar.gz][gzipped tar archive]]. These archives contain both the Lisp file org.el and the documentation in PDF and (TeX)Info formats. A shell script to simplify upgrading to the newest release has been posted [[http://www.philfam.co.uk/pete/GTD/org-mode/update-org.sh][here]]. +**** Get the development version + +You can check out the latest Org development version by using git. +More information on this page: http://repo.or.cz/w/org-mode.git + * Documentation ** Manual and Reference card - Read the documentation [[file:manual/index.html][online]]. This is a version consisting of many @@ -207,6 +213,7 @@ page]], and start from there. somehow, when I get to it... * Related Software + [[http://sachachua.com/wp/][Sacha Chua]] about [[http://sachachua.com/wp/2007/12/26/emacs-choosing-between-org-and-planner/][Choosing between Planner and Org]].