From c2712137be838eb551344a293cabaf1abfab7c20 Mon Sep 17 00:00:00 2001 From: Carsten Dominik Date: Wed, 19 Aug 2009 09:33:17 +0100 Subject: [PATCH] Clean up after John's iswitchb patch --- lisp/ChangeLog | 17 +++++++++++++++++ lisp/org-attach.el | 4 ++-- lisp/org-colview-xemacs.el | 8 ++++---- lisp/org-colview.el | 8 ++++---- lisp/org-publish.el | 2 +- lisp/org-remember.el | 2 +- 6 files changed, 29 insertions(+), 12 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 18498d20d..220537d63 100755 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,20 @@ +2009-08-19 Carsten Dominik + + * org-remember.el (org-remember-apply-template): Use + org-icompleting-read. + + * org-publish.el (org-publish): Use org-icompleting-read. + + * org-colview.el (org-columns-edit-value, org-columns-new) + (org-insert-columns-dblock): Use org-icompleting-read. + + * org-colview-xemacs.el (org-columns-edit-value) + (org-columns-new, org-insert-columns-dblock): Use + org-icompleting-read. + + * org-attach.el (org-attach-delete-one, org-attach-open): Use + org-icompleting-read. + 2009-08-18 Carsten Dominik * org.el (org-hierarchical-todo-statistics): Improve docstring. diff --git a/lisp/org-attach.el b/lisp/org-attach.el index b8f9a1ce7..813950927 100644 --- a/lisp/org-attach.el +++ b/lisp/org-attach.el @@ -314,7 +314,7 @@ The attachment is created as an Emacs buffer." (let* ((attach-dir (org-attach-dir t)) (files (org-attach-file-list attach-dir)) (file (or file - (org-ido-completing-read + (org-icompleting-read "Delete attachment: " (mapcar (lambda (f) (list (file-name-nondirectory f))) @@ -389,7 +389,7 @@ If IN-EMACS is non-nil, force opening in Emacs." (files (org-attach-file-list attach-dir)) (file (if (= (length files) 1) (car files) - (org-ido-completing-read "Open attachment: " + (org-icompleting-read "Open attachment: " (mapcar 'list files) nil t)))) (org-open-file (expand-file-name file attach-dir) in-emacs))) diff --git a/lisp/org-colview-xemacs.el b/lisp/org-colview-xemacs.el index 086594803..abde16569 100644 --- a/lisp/org-colview-xemacs.el +++ b/lisp/org-colview-xemacs.el @@ -627,7 +627,7 @@ Where possible, use the standard interface for changing this line." (t (setq allowed (org-property-get-allowed-values pom key 'table)) (if allowed - (setq nval (org-ido-completing-read "Value: " allowed nil t)) + (setq nval (org-icompleting-read "Value: " allowed nil t)) (setq nval (read-string "Edit: " value))) (setq nval (org-trim nval)) (when (not (equal nval value)) @@ -904,7 +904,7 @@ interactive function org-columns-new.") (let ((n (org-columns-current-column)) (editp (and prop (assoc prop org-columns-current-fmt-compiled))) cell) - (setq prop (org-ido-completing-read + (setq prop (org-icompleting-read "Property: " (mapcar 'list (org-buffer-property-keys t nil t)) nil nil prop)) (setq title (read-string (concat "Column title [" prop "]: ") (or title prop))) @@ -912,7 +912,7 @@ interactive function org-columns-new.") (if (string-match "\\S-" width) (setq width (string-to-number width)) (setq width nil)) - (setq fmt (org-ido-completing-read "Summary [none]: " + (setq fmt (org-icompleting-read "Summary [none]: " (mapcar (lambda (x) (list (symbol-name (cadr x)))) org-columns-compile-map) nil t)) (setq fmt (intern fmt) @@ -1443,7 +1443,7 @@ and tailing newline characters." (interactive) (when (featurep 'xemacs) (org-columns-quit)) (let ((defaults '(:name "columnview" :hlines 1)) - (id (org-ido-completing-read + (id (org-icompleting-read "Capture columns (local, global, entry with :ID: property) [local]: " (append '(("global") ("local")) (mapcar 'list (org-property-values "ID")))))) diff --git a/lisp/org-colview.el b/lisp/org-colview.el index 72681447a..3a8505ce2 100644 --- a/lisp/org-colview.el +++ b/lisp/org-colview.el @@ -446,7 +446,7 @@ Where possible, use the standard interface for changing this line." (t (setq allowed (org-property-get-allowed-values pom key 'table)) (if allowed - (setq nval (org-ido-completing-read "Value: " allowed nil t)) + (setq nval (org-icompleting-read "Value: " allowed nil t)) (setq nval (read-string "Edit: " value))) (setq nval (org-trim nval)) (when (not (equal nval value)) @@ -721,7 +721,7 @@ interactive function org-columns-new.") (interactive) (let ((editp (and prop (assoc prop org-columns-current-fmt-compiled))) cell) - (setq prop (org-ido-completing-read + (setq prop (org-icompleting-read "Property: " (mapcar 'list (org-buffer-property-keys t nil t)) nil nil prop)) (setq title (read-string (concat "Column title [" prop "]: ") (or title prop))) @@ -729,7 +729,7 @@ interactive function org-columns-new.") (if (string-match "\\S-" width) (setq width (string-to-number width)) (setq width nil)) - (setq fmt (org-ido-completing-read + (setq fmt (org-icompleting-read "Summary [none]: " (mapcar (lambda (x) (list (symbol-name (cadr x)))) org-columns-compile-map) @@ -1228,7 +1228,7 @@ and tailing newline characters." "Create a dynamic block capturing a column view table." (interactive) (let ((defaults '(:name "columnview" :hlines 1)) - (id (org-ido-completing-read + (id (org-icompleting-read "Capture columns (local, global, entry with :ID: property) [local]: " (append '(("global") ("local")) (mapcar 'list (org-property-values "ID")))))) diff --git a/lisp/org-publish.el b/lisp/org-publish.el index 37af0fc2c..8e5ff2d82 100644 --- a/lisp/org-publish.el +++ b/lisp/org-publish.el @@ -632,7 +632,7 @@ Default for INDEX-FILENAME is 'sitemap.org'." "Publish PROJECT." (interactive (list - (assoc (org-ido-completing-read + (assoc (org-icompleting-read "Publish project: " org-publish-project-alist nil t) org-publish-project-alist) diff --git a/lisp/org-remember.el b/lisp/org-remember.el index 22354819e..8d93cc2c8 100644 --- a/lisp/org-remember.el +++ b/lisp/org-remember.el @@ -552,7 +552,7 @@ to be run from that hook to function properly." (org-global-tags-completion-table (if (equal char "G") (org-agenda-files) (and file (list file))))) (org-add-colon-after-tag-completion t) - (ins (org-ido-completing-read + (ins (org-icompleting-read (if prompt (concat prompt ": ") "Tags: ") 'org-tags-completion-function nil nil nil 'org-tags-history)))