# HG changeset patch
# User Carsten Dominik <dominik@science.uva.nl>
# Date 1235120569 0
# Node ID b8dfb0b7d10f0d9d8266f8d74025e9db0044071f
# Parent  4112729ac2e415e11c9f84c96e3955b29a305f44
2009-02-20  Carsten Dominik  <dominik@science.uva.nl>

	* org-remember.el (org-remember-apply-template): Turn off ido for
	this completion.

	* org.el (org-priority): Also find invisible headings, for remote
	editing.
	(org-completing-read-no-ido): New function.
	(org-make-tags-matcher, org-set-property): Turn off ido for this completion.

	* org-colview.el (org-columns-edit-value): No special treatment of
	prefix arg.

diff -r 4112729ac2e4 -r b8dfb0b7d10f lisp/org/ChangeLog
--- a/lisp/org/ChangeLog	Fri Feb 20 06:18:51 2009 +0000
+++ b/lisp/org/ChangeLog	Fri Feb 20 09:02:49 2009 +0000
@@ -1,3 +1,16 @@
+2009-02-20  Carsten Dominik  <dominik@science.uva.nl>
+
+	* org-remember.el (org-remember-apply-template): Turn off ido for
+	this completion.
+
+	* org.el (org-priority): Also find invisible headings, for remote
+	editing.
+	(org-completing-read-no-ido): New function.
+	(org-make-tags-matcher, org-set-property): Turn off ido for this completion.
+
+	* org-colview.el (org-columns-edit-value): No special treatment of
+	prefix arg.
+
 2009-02-19  Carsten Dominik  <dominik@science.uva.nl>
 
 	* org.el (org-block-todo-from-children-or-siblings): Use
diff -r 4112729ac2e4 -r b8dfb0b7d10f lisp/org/org-colview.el
--- a/lisp/org/org-colview.el	Fri Feb 20 06:18:51 2009 +0000
+++ b/lisp/org/org-colview.el	Fri Feb 20 09:02:49 2009 +0000
@@ -383,8 +383,7 @@
 Where possible, use the standard interface for changing this line."
   (interactive)
   (org-columns-check-computed)
-  (let* ((external-key key)
-	 (col (current-column))
+  (let* ((col (current-column))
 	 (key (or key (get-char-property (point) 'org-columns-key)))
 	 (value (get-char-property (point) 'org-columns-value))
 	 (bol (point-at-bol)) (eol (point-at-eol))
@@ -406,9 +405,7 @@
 		    (org-edit-headline))))
      ((equal key "TODO")
       (setq eval '(org-with-point-at pom
-		    (let ((current-prefix-arg
-			   (if external-key current-prefix-arg '(4))))
-		      (call-interactively 'org-todo)))))
+				     (call-interactively 'org-todo))))
      ((equal key "PRIORITY")
       (setq eval '(org-with-point-at pom
 		    (call-interactively 'org-priority))))
diff -r 4112729ac2e4 -r b8dfb0b7d10f lisp/org/org-remember.el
--- a/lisp/org/org-remember.el	Fri Feb 20 06:18:51 2009 +0000
+++ b/lisp/org/org-remember.el	Fri Feb 20 09:02:49 2009 +0000
@@ -538,7 +538,7 @@
 			   propprompt
 			   (mapcar 'list (org-split-string allowed "[ \t]+"))
 			   nil 'req-match)
-			(org-completing-read propprompt existing nil nil
+			(org-completing-read-no-ido propprompt existing nil nil
 					     "" nil ""))))
 	      (org-set-property prop val)))
 	   (char
diff -r 4112729ac2e4 -r b8dfb0b7d10f lisp/org/org.el
--- a/lisp/org/org.el	Fri Feb 20 06:18:51 2009 +0000
+++ b/lisp/org/org.el	Fri Feb 20 09:02:49 2009 +0000
@@ -6956,6 +6956,10 @@
     (org-defkey minibuffer-local-completion-map "?" 'self-insert-command)
     (apply 'org-ido-completing-read args)))
 
+(defun org-completing-read-no-ido (&rest args)
+  (let (org-completion-use-ido)
+    (apply 'org-completing-read args)))
+
 (defun org-ido-completing-read (&rest args)
   "Completing-read using `ido-mode' speedups if available"
   (if (and org-completion-use-ido
@@ -9391,7 +9395,7 @@
   (setq action (or action 'set))
   (let (current new news have remove)
     (save-excursion
-      (org-back-to-heading)
+      (org-back-to-heading t)
       (if (looking-at org-priority-regexp)
 	  (setq current (string-to-char (match-string 2))
 		have t)
@@ -9652,7 +9656,7 @@
     ;; Get a new match request, with completion
     (let ((org-last-tags-completion-table
 	   (org-global-tags-completion-table)))
-      (setq match (org-completing-read
+      (setq match (org-completing-read-no-ido
 		   "Match: " 'org-tags-completion-function nil nil nil
 		   'org-tags-history))))
 
@@ -10889,7 +10893,7 @@
 	  (existing (mapcar 'list (org-property-values prop)))
 	  (val (if allowed
 		   (org-completing-read "Value: " allowed nil 'req-match)
-		 (org-completing-read
+		 (org-completing-read-no-ido
 		  (concat "Value" (if (and cur (string-match "\\S-" cur))
 				      (concat "[" cur "]") "")
 			  ": ")