summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Dominik <dominik@sam.science.uva.nl>2008-06-10 13:42:27 +0200
committerCarsten Dominik <dominik@sam.science.uva.nl>2008-06-10 13:42:27 +0200
commitedfd4f8abf989219b93c066f2b656e2d958b2809 (patch)
tree62ccc9f0a039c9ff936a0b74a3f38ea2ba30c1ea
parentd821bf13b141a08a50ff12b33eac5e99269bf7ab (diff)
downloadorg-mode-edfd4f8abf989219b93c066f2b656e2d958b2809.tar.gz
Fixed bug with file tags.
This bug was reported by Manuel Hermenegildo. There were really two issues: The parsing of the FILETAGS line was broken, and the function `org-get-tags-at' did ignore these tags. Both problems are fixed now.
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/org-exp.el2
-rw-r--r--lisp/org.el8
3 files changed, 12 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d62949..7adb524 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
2008-06-10 Carsten Dominik <dominik@science.uva.nl>
+ * org-exp.el (org-get-current-options): Add the FILETAGS setting.
+
+ * org.el (org-set-regexps-and-options): Fix bug with parsing of
+ file tags.
+ (org-get-tags-at): Add the content of `org-file-tags'.
+
* org-exp.el (org-export-handle-comments): Fix bug with several
comment lines after each other.
(org-number-to-roman, org-number-to-counter): New functions.
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index c24eae0..245e538 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -2374,6 +2374,7 @@ Does include HTML export options as well as TODO and CATEGORY stuff."
#+DRAWERS: %s
#+STARTUP: %s %s %s %s %s
#+TAGS: %s
+#+FILETAGS: %s
#+ARCHIVE: %s
#+LINK: %s
"
@@ -2419,6 +2420,7 @@ Does include HTML export options as well as TODO and CATEGORY stuff."
((cdr x) (format "%s(%c)" (car x) (cdr x)))
(t (car x))))
(or org-tag-alist (org-get-buffer-tags)) " ") "")
+ (mapconcat 'identity org-file-tags " ")
org-archive-location
"org file:~/org/%s.org"
))
diff --git a/lisp/org.el b/lisp/org.el
index 6da37fa..0575ba2 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -2185,7 +2185,7 @@ Use customize to modify this, or restart Emacs after changing it."
(sexp :tag "Forbidden chars in border ")
(sexp :tag "Regexp for body ")
(integer :tag "number of newlines allowed")
- (option (boolean :tag "Stacking (DISABLED) "))))
+ (option (boolean :tag "Please ignore this button"))))
(defcustom org-emphasis-alist
`(("*" bold "<b>" "</b>")
@@ -2834,7 +2834,7 @@ means to push this value onto the list in the variable.")
(push (cons (match-string 1 value) (match-string 2 value))
props)))
((equal key "FILETAGS")
- (when (string-match "\\(\\S-+\\)\\s-+\\(.*\\)" value)
+ (when (string-match "\\S-" value)
(setq ftags
(append
ftags
@@ -9468,7 +9468,7 @@ also TODO lines."
"Get a list of all headline tags applicable at POS.
POS defaults to point. If tags are inherited, the list contains
the targets in the same sequence as the headlines appear, i.e.
-sthe tags of the current headline come last."
+the tags of the current headline come last."
(interactive)
(let (tags ltags lastpos parent)
(save-excursion
@@ -9490,7 +9490,7 @@ sthe tags of the current headline come last."
(org-up-heading-all 1)
(setq parent t)))
(error nil))))
- tags)))
+ (append (org-remove-uniherited-tags org-file-tags) tags))))
(defun org-toggle-tag (tag &optional onoff)
"Toggle the tag TAG for the current line.