From 8a90b34aa662e28a38dc0bd1f40995174bd4a7f9 Mon Sep 17 00:00:00 2001
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Date: Thu, 26 Apr 2018 02:30:09 +0200
Subject: [PATCH] Fix error when setting more than one tag

* lisp/org.el (org-set-tags-command): Fix type of history argument in
  `completing-read'.
---
 lisp/org.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/org.el b/lisp/org.el
index 0b8e62357..84ae65ba9 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -14255,7 +14255,8 @@ in Lisp code use `org-set-tags' instead."
 		 (org-trim (completing-read
 			    "Tags: "
 			    #'org-tags-completion-function
-			    nil nil current-tags 'org-tags-history)))))))
+			    nil nil (org-make-tag-string current-tags)
+			    'org-tags-history)))))))
       (org-set-tags tags)))))
 
 (defun org-align-tags (&optional all)
-- 
2.11.4.GIT