Browse Source

Get rid of some compiler messages by fixing bugs and definitions.

Carsten Dominik 16 years ago
parent
commit
1b23a3fd20
4 changed files with 24 additions and 21 deletions
  1. 2 0
      lisp/ChangeLog
  2. 2 1
      lisp/org-agenda.el
  3. 19 19
      lisp/org-exp.el
  4. 1 1
      lisp/org-publish.el

+ 2 - 0
lisp/ChangeLog

@@ -1,5 +1,7 @@
 2008-09-17  Carsten Dominik  <dominik@science.uva.nl>
 2008-09-17  Carsten Dominik  <dominik@science.uva.nl>
 
 
+	* org-agenda.el (org-global-tags-completion-table): New variable.
+
 	* org-exp.el (org-export-handle-export-tags): New function.
 	* org-exp.el (org-export-handle-export-tags): New function.
 	(org-export-preprocess-string): Call
 	(org-export-preprocess-string): Call
 	`org-export-handle-export-tags'.
 	`org-export-handle-export-tags'.

+ 2 - 1
lisp/org-agenda.el

@@ -4079,12 +4079,13 @@ When this is the global TODO list, a prefix argument will be interpreted."
     (goto-line line)
     (goto-line line)
     (recenter window-line)))
     (recenter window-line)))
 
 
+(defvar org-global-tags-completion-table nil)
 (defun org-agenda-filter-by-tag (strip &optional char)
 (defun org-agenda-filter-by-tag (strip &optional char)
   "Keep only those lines in the agenda buffer that have a specific tag.
   "Keep only those lines in the agenda buffer that have a specific tag.
 The tag is selected with its fast selection letter, as configured.
 The tag is selected with its fast selection letter, as configured.
 With prefix argument STRIP, remove all lines that do have the tag."
 With prefix argument STRIP, remove all lines that do have the tag."
   (interactive "P")
   (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: "
       (message "Select tag [%s] or no tag [ ], [TAB] to complete, [/] to restore: "
 	       (mapconcat
 	       (mapconcat
 		(lambda (x) (if (cdr x) (char-to-string (cdr x)) ""))
 		(lambda (x) (if (cdr x) (char-to-string (cdr x)) ""))

+ 19 - 19
lisp/org-exp.el

@@ -64,6 +64,24 @@ force an export command into the current process."
   :group 'org-export-general
   :group 'org-export-general
   :type 'boolean)
   :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
 (defcustom org-export-with-special-strings t
   "Non-nil means, interpret \"\-\", \"--\" and \"---\" for export.
   "Non-nil means, interpret \"\-\", \"--\" and \"---\" for export.
 When this option is turned on, these strings will be exported as:
 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
 	 (re-excl (concat ":\\(" (mapconcat 'regexp-quote
 					   exclude-tags "\\|")
 					   exclude-tags "\\|")
 			"\\):"))
 			"\\):"))
-	 beg end)
+	 beg end cont)
     (goto-char (point-min))
     (goto-char (point-min))
     (when (and select-tags
     (when (and select-tags
 	       (re-search-forward
 	       (re-search-forward
@@ -4513,24 +4531,6 @@ The XOXO buffer is named *xoxo-<source buffer name>*"
 
 
 (provide 'org-exp)
 (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
 ;; arch-tag: 65985fe9-095c-49c7-a7b6-cb4ee15c0a95
 
 
 ;;; org-exp.el ends here
 ;;; org-exp.el ends here

+ 1 - 1
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)
 (defun org-publish-expand-projects (projects-alist)
   "Expand projects in PROJECTS-ALIST.
   "Expand projects in PROJECTS-ALIST.
 This splices all the components into the list."
 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))
     (while (setq p (pop rest))
       (if (setq components (plist-get (cdr p) :components))
       (if (setq components (plist-get (cdr p) :components))
 	  (setq rest (append
 	  (setq rest (append