mirror/org-mode
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-12-02 08:22:16 +00:00
Code

Merge branch 'hotfix'

Browse Source
This commit is contained in:
Bastien Guerry 2012-04-10 18:32:54 +02:00
commit 4f4b817315
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/org.el
View File

@ -13453,8 +13453,7 @@ With prefix ARG, realign all tags in headings in the current buffer."
;; Get a new set of tags from the user
(save-excursion
(setq table (append org-tag-persistent-alist
org-tag-alist
(org-get-buffer-tags)
(or org-tag-alist (org-get-buffer-tags))
(and
org-complete-tags-always-offer-all-agenda-tags
(org-global-tags-completion-table
@ -13756,14 +13755,9 @@ Returns the new tags string, or nil to not change the current settings."
(condition-case nil
(setq tg (org-icompleting-read
"Tag: "
(delete-dups
(append (or buffer-tags
(with-current-buffer buf
(mapcar 'car (org-get-buffer-tags))))
(delq nil
(mapcar (lambda (x)
(if (stringp
(car x)) x)) table))))))
(or buffer-tags
(with-current-buffer buf
(org-get-buffer-tags)))))
(quit (setq tg "")))
(when (string-match "\\S-" tg)
(add-to-list 'buffer-tags (list tg))