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

Merge branch 'master' of code.orgmode.org:bzg/org-mode

This commit is contained in:
Nicolas Goaziou 2018-03-28 17:14:31 +02:00
parent e01bc94506 052fc2226b
commit df40cf42e5
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org.el
View File

@ -4825,10 +4825,10 @@ Support for group tags is controlled by the option
((null alist2) alist1) ((null alist2) alist1)
((null alist1) alist2) ((null alist1) alist2)
(t (let ((alist2-cars (mapcar (lambda (x) (car-safe x)) alist2)) (t (let ((alist2-cars (mapcar (lambda (x) (car-safe x)) alist2))
to-add) to-add)
(dolist (i alist1) (dolist (i alist1)
(unless (member (car-safe i) alist2-cars) (unless (member (car-safe i) alist2-cars)
(push i to-add))) (push i to-add)))
(append to-add alist2))))) (append to-add alist2)))))
(defun org-set-regexps-and-options (&optional tags-only) (defun org-set-regexps-and-options (&optional tags-only)
@ -13721,9 +13721,9 @@ instead of the agenda files."
(org-tag-add-to-alist (org-tag-add-to-alist
(org-get-buffer-tags) (org-get-buffer-tags)
(mapcar (lambda (x) (mapcar (lambda (x)
(and (stringp (car-safe x)) (and (stringp (car-safe x))
(list (car-safe x)))) (list (car-safe x))))
org-current-tag-alist))) org-current-tag-alist)))
(if (car-safe files) files (if (car-safe files) files
(org-agenda-files)))))))) (org-agenda-files))))))))