diff lisp/org/org.el @ 102148:b8dfb0b7d10f

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.
author Carsten Dominik <dominik@science.uva.nl>
date Fri, 20 Feb 2009 09:02:49 +0000
parents f37df1494dcd
children ac1a55cc2c38
line wrap: on
line diff
--- 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 "]") "")
 			  ": ")