diff options
| -rw-r--r-- | lisp/org/ChangeLog | 13 | ||||
| -rw-r--r-- | lisp/org/org-colview.el | 7 | ||||
| -rw-r--r-- | lisp/org/org-remember.el | 2 | ||||
| -rw-r--r-- | lisp/org/org.el | 10 |
4 files changed, 23 insertions, 9 deletions
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog index 7e66c35dfdd..c3b5f12dd10 100644 --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@ -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 --git a/lisp/org/org-colview.el b/lisp/org/org-colview.el index 3171332e252..5a896185590 100644 --- a/lisp/org/org-colview.el +++ b/lisp/org/org-colview.el @@ -383,8 +383,7 @@ If yes, throw an error indicating that changing it does not make sense." 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 @@ Where possible, use the standard interface for changing this line." (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 --git a/lisp/org/org-remember.el b/lisp/org/org-remember.el index 2efc6a47957..d2dcedfeb5c 100644 --- a/lisp/org/org-remember.el +++ b/lisp/org/org-remember.el @@ -538,7 +538,7 @@ to be run from that hook to function properly." 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 --git a/lisp/org/org.el b/lisp/org/org.el index d9177579912..2f9847e2fee 100644 --- a/lisp/org/org.el +++ b/lisp/org/org.el @@ -6956,6 +6956,10 @@ used as the link location instead of reading one interactively." (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 @@ ACTION can be `set', `up', `down', or a character." (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 @@ also TODO lines." ;; 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 @@ in the current file." (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 "]") "") ": ") |