workgroups2 Changeset - 928d509157ec

Changeset - 928d509157ec

Parent rev.

Child rev.

[Not reviewed]

1.2.0 master

0 1 0

Yuriy Pitomets - 11 years ago 2014-11-02 20:22:33
pitometsu@gmail.com

Use ido only when ido-mode enabled.

1 file changed with 11 insertions and 3 deletions:

src/workgroups2.el

0 comments (0 inline, 0 general)

src/workgroups2.el

➞

Show inline comments

@@ @@ -2436,13 +2436,13 @@ If you want, restore them manually and try again." @@
 (defun wg-restore-saved-wconfig ()
   "Restore one of the current workgroup's saved wconfigs in `selected-frame'."
   (interactive)
   (let ((workgroup (wg-current-workgroup)))
     (wg-restore-wconfig-undoably
      (wg-workgroup-get-saved-wconfig
-      (ido-completing-read "Saved wconfig: "
+      (wg-completing-read "Saved wconfig: "
                           (mapcar 'wg-wconfig-name (wg-workgroup-saved-wconfigs workgroup))
                           nil t)
       workgroup))))
 (defun wg-kill-saved-wconfig ()
   "Kill one of the current workgroup's saved wconfigs.
         (fset 'buffer-list wg-buffer-list-function)))))
 ;;; buffer object utils
 (defun wg-completing-read (prompt choices &optional pred require-match initial-input history default)
   "Do a completing read.  Use `ido-mode` if enabled."
   (if ido-mode
       (ido-completing-read prompt choices pred require-match
                            initial-input history default)
     (completing-read prompt choices pred require-match
                      initial-input history default)))
 (defun wg-buffer-uid (buffer-or-name)
   "Return BUFFER-OR-NAME's buffer-local value of `wg-buffer-uid'."
   (buffer-local-value 'wg-buffer-uid (wg-get-buffer buffer-or-name)))
 (defun wg-bufobj-uid (bufobj)
   "Return BUFOBJ's uid."
@@ @@ -3465,13 +3473,13 @@ Or scream unless NOERROR." @@
   "Return a list of workgroup names or scream unless NOERROR."
   (mapcar 'wg-workgroup-name (wg-workgroup-list-or-error noerror)))
 (defun wg-read-workgroup-name (&optional require-match)
   "Read a workgroup name from `wg-workgroup-names'.
 REQUIRE-MATCH to match."
-  (ido-completing-read "Workgroup: " (wg-workgroup-names) nil require-match nil nil
+  (wg-completing-read "Workgroup: " (wg-workgroup-names) nil require-match nil nil
                       (awhen (wg-current-workgroup t) (wg-workgroup-name it))))
 (defun wg-new-default-workgroup-name ()
   "Return a new, unique, default workgroup name."
   (let ((names (wg-workgroup-names t)) (index -1) result)
     (while (not result)
@@ @@ -3485,13 +3493,13 @@ REQUIRE-MATCH to match." @@
   (cl-every (lambda (existing-name) (not (equal new-name existing-name)))
             (wg-workgroup-names t)))
 (defun wg-read-saved-wconfig-name (workgroup &optional prompt require-match)
   "Read the name of a saved wconfig, completing on the names of
 WORKGROUP's saved wconfigs."
-  (ido-completing-read (or prompt "Saved wconfig name: ")
+  (wg-completing-read (or prompt "Saved wconfig name: ")
                       (wg-workgroup-saved-wconfig-names workgroup)
                       nil require-match))
 (defun wg-read-saved-wconfig (workgroup)
   "Read the name of and return one of WORKGROUP's saved wconfigs."
   (wg-workgroup-get-saved-wconfig

0 comments (0 inline, 0 general)