0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-07-16 00:16:27 +00:00

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
commit 72d911cfa2

View file

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