From 6c67af56272eb84bacc4028b6850168199d6491e Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 10 Apr 2012 18:03:39 +0200 Subject: [PATCH 1/4] Revert "org.el: Include `org-tag-alist' in the list for tag completions." This reverts commit acc7a0b2bbb440b89039d56a3ffdd4bb17c9bf47. See http://article.gmane.org/gmane.emacs.orgmode/54406 --- lisp/org.el | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 1ffd029ac..d3f58efb0 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -13424,8 +13424,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 From b05cbf73a0ad92b2a32cd2ac365cc05b1dd8be42 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 10 Apr 2012 18:04:28 +0200 Subject: [PATCH 2/4] Revert "org.el: Fix bug when gathering tag completion options." This reverts commit e48d67ed6d6a0f352449fbeea6091b6f216c9990. This commit doesn't take care of tag groups. --- lisp/org.el | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index d3f58efb0..17a8834ab 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -13730,10 +13730,7 @@ 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)))) - (delq nil - (mapcar (lambda (x) - (if (stringp - (car x)) x)) table)))))) + (mapcar 'car table))))) (quit (setq tg ""))) (when (string-match "\\S-" tg) (add-to-list 'buffer-tags (list tg)) From 1f80206166b0f3087fcb3649da9751523493db6d Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 10 Apr 2012 18:10:30 +0200 Subject: [PATCH 3/4] Revert "org.el (org-fast-tag-selection): Fix an bug when listing tags for completion." This reverts commit dca5af369c698961a36a32dc78eaa15e14ea808e. --- lisp/org.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 17a8834ab..e43189ad2 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -13726,11 +13726,10 @@ 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)))) - (mapcar 'car table))))) + (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)) From d4ddcbb8b3b4587fb274a9d0a15c8691a396e416 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 10 Apr 2012 18:20:04 +0200 Subject: [PATCH 4/4] Revert "org.el: Include tags from `org-tag-alist' when completing with the TAB key." This reverts commit 647396464d563634b980127673cf61769663407e. --- lisp/org.el | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index e43189ad2..3dd8f88f2 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -13726,10 +13726,9 @@ Returns the new tags string, or nil to not change the current settings." (condition-case nil (setq tg (org-icompleting-read "Tag: " - (append (or buffer-tags - (with-current-buffer buf - (org-get-buffer-tags))) - (mapcar 'car 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))