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

Merge branch 'hotfix-7.8.06'

This commit is contained in:
Bastien Guerry 2012-03-27 12:10:31 +02:00
parent ef0ab2fc4c d069301060
commit c760f9be7e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org.el
View File

@ -13465,7 +13465,7 @@ With prefix ARG, realign all tags in headings in the current buffer."
current-tags inherited-tags table
(if org-fast-tag-selection-include-todo
org-todo-key-alist))
(let ((org-add-colon-after-tag-completion t))
(let ((org-add-colon-after-tag-completion (< 1 (length table))))
(org-trim
(org-icompleting-read "Tags: "
'org-tags-completion-function
@ -13749,9 +13749,10 @@ Returns the new tags string, or nil to not change the current settings."
(condition-case nil
(setq tg (org-icompleting-read
"Tag: "
(or buffer-tags
(with-current-buffer buf
(org-get-buffer-tags)))))
(append (or buffer-tags
(with-current-buffer buf
(org-get-buffer-tags)))
(mapcar 'car table))))
(quit (setq tg "")))
(when (string-match "\\S-" tg)
(add-to-list 'buffer-tags (list tg))