ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up after John's iswitchb patch

This commit is contained in:
Carsten Dominik 2009-08-19 09:33:17 +01:00
parent c7c1a9ea75
commit c2712137be
6 changed files with 29 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/ChangeLog
View File

@ -1,3 +1,20 @@
2009-08-19 Carsten Dominik <carsten.dominik@gmail.com>
* 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 <carsten.dominik@gmail.com> 2009-08-18 Carsten Dominik <carsten.dominik@gmail.com>
* org.el (org-hierarchical-todo-statistics): Improve docstring. * org.el (org-hierarchical-todo-statistics): Improve docstring.

4
lisp/org-attach.el
View File

@ -314,7 +314,7 @@ The attachment is created as an Emacs buffer."
(let* ((attach-dir (org-attach-dir t)) (let* ((attach-dir (org-attach-dir t))
(files (org-attach-file-list attach-dir)) (files (org-attach-file-list attach-dir))
(file (or file (file (or file
(org-ido-completing-read (org-icompleting-read
"Delete attachment: " "Delete attachment: "
(mapcar (lambda (f) (mapcar (lambda (f)
(list (file-name-nondirectory 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)) (files (org-attach-file-list attach-dir))
(file (if (= (length files) 1) (file (if (= (length files) 1)
(car files) (car files)
(org-ido-completing-read "Open attachment: " (org-icompleting-read "Open attachment: "
(mapcar 'list files) nil t)))) (mapcar 'list files) nil t))))
(org-open-file (expand-file-name file attach-dir) in-emacs))) (org-open-file (expand-file-name file attach-dir) in-emacs)))

8
lisp/org-colview-xemacs.el
View File

@ -627,7 +627,7 @@ Where possible, use the standard interface for changing this line."
(t (t
(setq allowed (org-property-get-allowed-values pom key 'table)) (setq allowed (org-property-get-allowed-values pom key 'table))
(if allowed (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 (read-string "Edit: " value)))
(setq nval (org-trim nval)) (setq nval (org-trim nval))
(when (not (equal nval value)) (when (not (equal nval value))
@ -904,7 +904,7 @@ interactive function org-columns-new.")
(let ((n (org-columns-current-column)) (let ((n (org-columns-current-column))
(editp (and prop (assoc prop org-columns-current-fmt-compiled))) (editp (and prop (assoc prop org-columns-current-fmt-compiled)))
cell) cell)
(setq prop (org-ido-completing-read (setq prop (org-icompleting-read
"Property: " (mapcar 'list (org-buffer-property-keys t nil t)) "Property: " (mapcar 'list (org-buffer-property-keys t nil t))
nil nil prop)) nil nil prop))
(setq title (read-string (concat "Column title [" prop "]: ") (or title 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) (if (string-match "\\S-" width)
(setq width (string-to-number width)) (setq width (string-to-number width))
(setq width nil)) (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) (mapcar (lambda (x) (list (symbol-name (cadr x)))) org-columns-compile-map)
nil t)) nil t))
(setq fmt (intern fmt) (setq fmt (intern fmt)
@ -1443,7 +1443,7 @@ and tailing newline characters."
(interactive) (interactive)
(when (featurep 'xemacs) (org-columns-quit)) (when (featurep 'xemacs) (org-columns-quit))
(let ((defaults '(:name "columnview" :hlines 1)) (let ((defaults '(:name "columnview" :hlines 1))
(id (org-ido-completing-read (id (org-icompleting-read
"Capture columns (local, global, entry with :ID: property) [local]: " "Capture columns (local, global, entry with :ID: property) [local]: "
(append '(("global") ("local")) (append '(("global") ("local"))
(mapcar 'list (org-property-values "ID")))))) (mapcar 'list (org-property-values "ID"))))))

8
lisp/org-colview.el
View File

@ -446,7 +446,7 @@ Where possible, use the standard interface for changing this line."
(t (t
(setq allowed (org-property-get-allowed-values pom key 'table)) (setq allowed (org-property-get-allowed-values pom key 'table))
(if allowed (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 (read-string "Edit: " value)))
(setq nval (org-trim nval)) (setq nval (org-trim nval))
(when (not (equal nval value)) (when (not (equal nval value))
@ -721,7 +721,7 @@ interactive function org-columns-new.")
(interactive) (interactive)
(let ((editp (and prop (assoc prop org-columns-current-fmt-compiled))) (let ((editp (and prop (assoc prop org-columns-current-fmt-compiled)))
cell) cell)
(setq prop (org-ido-completing-read (setq prop (org-icompleting-read
"Property: " (mapcar 'list (org-buffer-property-keys t nil t)) "Property: " (mapcar 'list (org-buffer-property-keys t nil t))
nil nil prop)) nil nil prop))
(setq title (read-string (concat "Column title [" prop "]: ") (or title 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) (if (string-match "\\S-" width)
(setq width (string-to-number width)) (setq width (string-to-number width))
(setq width nil)) (setq width nil))
(setq fmt (org-ido-completing-read (setq fmt (org-icompleting-read
"Summary [none]: " "Summary [none]: "
(mapcar (lambda (x) (list (symbol-name (cadr x)))) (mapcar (lambda (x) (list (symbol-name (cadr x))))
org-columns-compile-map) org-columns-compile-map)
@ -1228,7 +1228,7 @@ and tailing newline characters."
"Create a dynamic block capturing a column view table." "Create a dynamic block capturing a column view table."
(interactive) (interactive)
(let ((defaults '(:name "columnview" :hlines 1)) (let ((defaults '(:name "columnview" :hlines 1))
(id (org-ido-completing-read (id (org-icompleting-read
"Capture columns (local, global, entry with :ID: property) [local]: " "Capture columns (local, global, entry with :ID: property) [local]: "
(append '(("global") ("local")) (append '(("global") ("local"))
(mapcar 'list (org-property-values "ID")))))) (mapcar 'list (org-property-values "ID"))))))

2
lisp/org-publish.el
View File

@ -632,7 +632,7 @@ Default for INDEX-FILENAME is 'sitemap.org'."
"Publish PROJECT." "Publish PROJECT."
(interactive (interactive
(list (list
(assoc (org-ido-completing-read (assoc (org-icompleting-read
"Publish project: " "Publish project: "
org-publish-project-alist nil t) org-publish-project-alist nil t)
org-publish-project-alist) org-publish-project-alist)

2
lisp/org-remember.el
View File

@ -552,7 +552,7 @@ to be run from that hook to function properly."
(org-global-tags-completion-table (org-global-tags-completion-table
(if (equal char "G") (org-agenda-files) (and file (list file))))) (if (equal char "G") (org-agenda-files) (and file (list file)))))
(org-add-colon-after-tag-completion t) (org-add-colon-after-tag-completion t)
(ins (org-ido-completing-read (ins (org-icompleting-read
(if prompt (concat prompt ": ") "Tags: ") (if prompt (concat prompt ": ") "Tags: ")
'org-tags-completion-function nil nil nil 'org-tags-completion-function nil nil nil
'org-tags-history))) 'org-tags-history)))