mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-11-25 07:27:57 +00:00
Code

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

Browse Source 
Conflicts:

	ChangeLog
This commit is contained in:
Carsten Dominik 2008-04-01 09:24:46 +02:00
commit 503ce14912
4 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,4 @@
2008-04-01 Carsten Dominik <dominik@science.uva.nl>
* lisp/org.el (org-modules): Allow additional symbols for external
@ -13,6 +14,14 @@
also a clocktable block shift.
(org-clocktable-try-shift): New function.
2008-03-31 Bastien Guerry <bzg@altern.org>
* 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 <dominik@science.uva.nl>
* lisp/org.el (org-columns-hscoll-title): New function.

BIN
ORGWEBPAGE/.DS_Store vendored
View File

Binary file not shown.

7
ORGWEBPAGE/index.org
View File

@ -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]].

17
lisp/org-publish.el
View File

@ -428,11 +428,13 @@ 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)
(unless (or fd-p (and skip-file (string-match skip-file 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 ;; 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 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 +448,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 +607,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)