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

Merge branch 'hotfix' 

Conflicts:
	lisp/org-capture.el
	lisp/org-clock.el
This commit is contained in:
Bastien Guerry 2012-04-03 14:09:12 +02:00
parent 64213b8e78 e48d67ed6d
commit 72d911cfa2
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org.el
View File

@ -13756,7 +13756,10 @@ Returns the new tags string, or nil to not change the current settings."
(append (or buffer-tags (append (or buffer-tags
(with-current-buffer buf (with-current-buffer buf
(mapcar 'car (org-get-buffer-tags)))) (mapcar 'car (org-get-buffer-tags))))
(mapcar 'car table))))) (delq nil
(mapcar (lambda (x)
(if (stringp
(car x)) x)) table))))))
(quit (setq tg ""))) (quit (setq tg "")))
(when (string-match "\\S-" tg) (when (string-match "\\S-" tg)
(add-to-list 'buffer-tags (list tg)) (add-to-list 'buffer-tags (list tg))