diff options
author | Bastien Guerry <bzg@altern.org> | 2008-03-04 00:22:46 +0000 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2008-03-04 00:22:46 +0000 |
commit | cd52b4e45763137309861dc1261205fb5dfb7624 (patch) | |
tree | 32c0dce2936e3f05b133510f6ac7c844182c8896 | |
parent | 497dfe10939320c1fde37c3db8c55488cda04487 (diff) | |
download | org-mode-cd52b4e45763137309861dc1261205fb5dfb7624.tar.gz |
Rename `org-publish-delete-duplicates' to `org-publish-delete-dups'.
`org-publish-delete-duplicates' was misleading because of the
distinction between `delete-dups' and `delete-duplicates'.
Also fix a bug in the interaction of `org-publish' and
`org-publish-current-project'.
-rw-r--r-- | org-publish.el | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/org-publish.el b/org-publish.el index fe050bd..d8595fb 100644 --- a/org-publish.el +++ b/org-publish.el @@ -356,8 +356,8 @@ List has a form of (file-name full-file-name (attribute-list))" ;; Delete-dups is not in Emacs <22 (if (fboundp 'delete-dups) - (defalias 'org-publish-delete-duplicates 'delete-dups) - (defun org-publish-delete-duplicates (list) + (defalias 'org-publish-delete-dups 'delete-dups) + (defun org-publish-delete-dups (list) "Destructively remove `equal' duplicates from LIST. Store the result in LIST and return it. LIST must be a proper list. Of several `equal' occurrences of an element in LIST, the first @@ -399,7 +399,7 @@ If NO-EXCLUSION is non-nil, don't exclude files." (if (plist-get (cdr p) :components) 'with-component 'without-component) p)) projects-alist) - (org-publish-delete-duplicates + (org-publish-delete-dups (append without-component (car (mapcar (lambda(p) (org-publish-expand-components p)) with-component)))))) @@ -407,7 +407,7 @@ If NO-EXCLUSION is non-nil, don't exclude files." (defun org-publish-expand-components (project) "Expand PROJECT into an alist of its components." (let* ((components (plist-get (cdr project) :components))) - (org-publish-delete-duplicates + (org-publish-delete-dups (mapcar (lambda(c) (assoc c org-publish-project-alist)) components)))) @@ -573,17 +573,19 @@ Default for INDEX-FILENAME is 'index.org'." ;;; Interactive publishing functions ;;;###autoload -(defun org-publish (project-name &optional force) - "Publish the project named PROJECT-NAME." - (interactive - (list (progn (completing-read - "Project name: " org-publish-project-alist nil t)) - current-prefix-arg)) +(defun org-publish (project &optional force) + "Publish PROJECT." + (interactive "P") (save-window-excursion - (let ((org-publish-use-timestamps-flag - (if force nil org-publish-use-timestamps-flag))) + (let* ((force current-prefix-arg) + (org-publish-use-timestamps-flag + (if force nil org-publish-use-timestamps-flag))) (org-publish-projects - (list (assoc project-name org-publish-project-alist)))))) + (list (or project + (assoc (completing-read + "Publish project: " + org-publish-project-alist nil t) + org-publish-project-alist))))))) ;;;###autoload (defun org-publish-all (&optional force) |