ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-07-06 16:15:36 +02:00
parent 0bab94dedf 4269178827
commit 878d6c35e3
1 changed files with 41 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/org.el
View File

@ -4835,8 +4835,16 @@ Support for group tags is controlled by the option
(mapcar 'org-add-prop-inherited ftags))) (mapcar 'org-add-prop-inherited ftags)))
(org-set-local 'org-tag-groups-alist nil) (org-set-local 'org-tag-groups-alist nil)
;; Process the tags. ;; Process the tags.
;; FIXME (when (and (not tags) org-tag-alist)
(when tags (setq tags
(mapcar
(lambda (tg) (cond ((eq (car tg) :startgroup) "{")
((eq (car tg) :endgroup) "}")
((eq (car tg) :grouptags) ":")
(t (concat (car tg)
(if (characterp (cdr tg))
(format "(%s)" (char-to-string (cdr tg))) "")))))
org-tag-alist)))
(let (e tgs g) (let (e tgs g)
(while (setq e (pop tags)) (while (setq e (pop tags))
(cond (cond
@ -4869,7 +4877,7 @@ Support for group tags is controlled by the option
(assoc (car e) org-tag-alist)) (assoc (car e) org-tag-alist))
(push e org-tag-alist))) (push e org-tag-alist)))
;; Return a list with tag variables ;; Return a list with tag variables
(list org-file-tags org-tag-alist org-tag-groups-alist)))))) (list org-file-tags org-tag-alist org-tag-groups-alist)))))
(defvar org-ota nil) (defvar org-ota nil)
(defun org-set-regexps-and-options () (defun org-set-regexps-and-options ()