# HG changeset patch
# User Carsten Dominik <dominik@science.uva.nl>
# Date 1172920669 0
# Node ID 1d7ec2331de4378c48005562506f909be6c27924
# Parent  549efc7149350cee88eff6811afb6463a065bfbd
Improved previous change.

diff -r 549efc714935 -r 1d7ec2331de4 lisp/textmodes/org.el
--- a/lisp/textmodes/org.el	Sat Mar 03 11:10:51 2007 +0000
+++ b/lisp/textmodes/org.el	Sat Mar 03 11:17:49 2007 +0000
@@ -11614,20 +11614,20 @@
       (if just-align
 	  (setq tags current)
 	;; Get a new set of tags from the user
-	(setq table (or org-tag-alist (org-get-buffer-tags))
-	      org-last-tags-completion-table table
-	      current-tags (org-split-string current ":")
-	      inherited-tags (nreverse
-			      (nthcdr (length current-tags)
-				      (nreverse (org-get-tags-at))))
-	      tags
-	      (if (or (eq t org-use-fast-tag-selection)
-		      (and org-use-fast-tag-selection
-			   (delq nil (mapcar 'cdr table))))
-		  (org-fast-tag-selection current-tags inherited-tags table)
-		(let ((org-add-colon-after-tag-completion t))
-		  (org-trim
-		   (save-excursion
+	(save-excursion
+	  (setq table (or org-tag-alist (org-get-buffer-tags))
+		org-last-tags-completion-table table
+		current-tags (org-split-string current ":")
+		inherited-tags (nreverse
+				(nthcdr (length current-tags)
+					(nreverse (org-get-tags-at))))
+		tags
+		(if (or (eq t org-use-fast-tag-selection)
+			(and org-use-fast-tag-selection
+			     (delq nil (mapcar 'cdr table))))
+		    (org-fast-tag-selection current-tags inherited-tags table)
+		  (let ((org-add-colon-after-tag-completion t))
+		    (org-trim
 		     (completing-read "Tags: " 'org-tags-completion-function
 				      nil nil current 'org-tags-history))))))
 	(while (string-match "[-+&]+" tags)