mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2025-01-05 11:45:52 +00:00
Code

Fixed bug with file tags.

Browse Source 
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.
This commit is contained in:
Carsten Dominik 2008-06-10 13:42:27 +02:00
parent d821bf13b1
commit edfd4f8abf
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

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

2
lisp/org-exp.el
View File

@ -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"
))

8
lisp/org.el
View File

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