From 1b23a3fd2067ada14c5b55bef8582f9b00503ae2 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Wed, 17 Sep 2008 13:55:59 +0200 Subject: [PATCH] Get rid of some compiler messages by fixing bugs and definitions. --- lisp/ChangeLog | 2 ++ lisp/org-agenda.el | 3 ++- lisp/org-exp.el | 38 +++++++++++++++++++------------------- lisp/org-publish.el | 2 +- 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 86d765018..43430d78f 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2008-09-17 Carsten Dominik + * org-agenda.el (org-global-tags-completion-table): New variable. + * org-exp.el (org-export-handle-export-tags): New function. (org-export-preprocess-string): Call `org-export-handle-export-tags'. diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index d1b84ae20..36da76fd4 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -4079,12 +4079,13 @@ When this is the global TODO list, a prefix argument will be interpreted." (goto-line line) (recenter window-line))) +(defvar org-global-tags-completion-table nil) (defun org-agenda-filter-by-tag (strip &optional char) "Keep only those lines in the agenda buffer that have a specific tag. The tag is selected with its fast selection letter, as configured. With prefix argument STRIP, remove all lines that do have the tag." (interactive "P") - (let (char a tag (inhibit-read-only t)) + (let (char a tag tags (inhibit-read-only t)) (message "Select tag [%s] or no tag [ ], [TAB] to complete, [/] to restore: " (mapconcat (lambda (x) (if (cdr x) (char-to-string (cdr x)) "")) diff --git a/lisp/org-exp.el b/lisp/org-exp.el index 0ed566cd0..d1a0c682c 100644 --- a/lisp/org-exp.el +++ b/lisp/org-exp.el @@ -64,6 +64,24 @@ force an export command into the current process." :group 'org-export-general :type 'boolean) + +(defcustom org-export-select-tags '("export") + "Tags that select a tree for export. +If any such tag is found in a buffer, all trees that do not carry one +of these tags will be deleted before export. +Inside trees that are selected like this, you can still deselect a +subtree by tagging it with one of the `org-export-excude-tags'." + :group 'org-export-general + :type '(repeat (string :tag "Tag"))) + +(defcustom org-export-exclude-tags '("noexport") + "Tags that exclude a tree from export. +All trees carrying any of these tags will be excluded from export. +This is without contition, so even subtrees inside that carry one of the +`org-export-select-tags' will be removed." + :group 'org-export-general + :type '(repeat (string :tag "Tag"))) + (defcustom org-export-with-special-strings t "Non-nil means, interpret \"\-\", \"--\" and \"---\" for export. When this option is turned on, these strings will be exported as: @@ -1579,7 +1597,7 @@ removed as well." (re-excl (concat ":\\(" (mapconcat 'regexp-quote exclude-tags "\\|") "\\):")) - beg end) + beg end cont) (goto-char (point-min)) (when (and select-tags (re-search-forward @@ -4513,24 +4531,6 @@ The XOXO buffer is named *xoxo-*" (provide 'org-exp) - -(defcustom org-export-select-tags '("export") - "Tags that select a tree for export. -If any such tag is found in a buffer, all trees that do not carry one -of these tags will be deleted before export. -Inside trees that are selected like this, you can still deselect a -subtree by tagging it with one of the `org-export-excude-tags'." - :group 'org-export - :type '(repeat (string :tag "Tag"))) - -(defcustom org-export-exclude-tags '("noexport") - "Tags that exclude a tree from export. -All trees carrying any of these tags will be excluded from export. -This is without contition, so even subtrees inside that carry one of the -`org-export-select-tags' will be removed." - :group 'org-export - :type '(repeat (string :tag "Tag"))) - ;; arch-tag: 65985fe9-095c-49c7-a7b6-cb4ee15c0a95 ;;; org-exp.el ends here diff --git a/lisp/org-publish.el b/lisp/org-publish.el index 98b6c6b49..f1a4b1909 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -410,7 +410,7 @@ If NO-EXCLUSION is non-nil, don't exclude files." (defun org-publish-expand-projects (projects-alist) "Expand projects in PROJECTS-ALIST. This splices all the components into the list." - (let ((rest projects-alist) rtn p c) + (let ((rest projects-alist) rtn p components) (while (setq p (pop rest)) (if (setq components (plist-get (cdr p) :components)) (setq rest (append