p36850791
/
kinetic-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix handling of defaults for completing-read 

The default parameter needs to be a list. Otherwise, ido-mode duplicates the
default entry. Patch by Thibault Kruse.
This commit is contained in:
Lorenz Moesenlechner 2011-02-21 17:09:19 +00:00
parent 6f67d63f04
commit 94a73efdcb
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/rosemacs/rosemacs.el
View File

@ -357,12 +357,12 @@
prompt (map 'list (lambda (x)
(cons x nil))
ros-packages)
nil nil nil nil default)))
nil nil nil nil (list default))))
(defun ros-completing-read-pkg-file (prompt &optional default-pkg)
(if (eq ros-completion-function 'ido-completing-read)
(ros-ido-completing-read-pkg-file prompt default-pkg)
(funcall ros-completion-function prompt ros-package-completor nil nil default-pkg)))
(funcall ros-completion-function prompt ros-package-completor nil nil (list default-pkg))))
;; Ido completion
(defun ros-ido-completing-read-pkg-file (prompt &optional default-pkg)
@ -400,7 +400,7 @@
nil))
ros-messages-list ros-message-packages)
nil nil nil nil (when (member default ros-messages-list)
default)))
(list default))))
(ws-pos (position ?\s result))
(message (substring result 0 ws-pos))
(package (when ws-pos
@ -422,7 +422,7 @@
nil))
ros-services-list ros-service-packages)
nil nil nil nil (when (member default ros-services-list)
default)))
(list default))))
(ws-pos (position ?\s result))
(service (substring result 0 ws-pos))
(package (when ws-pos
@ -437,7 +437,7 @@
(cons m nil))
ros-all-topics)
nil nil nil nil (when (member default (map 'list 'identity ros-all-topics))
default)))
(list default))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Navigation commands
@ -1163,7 +1163,7 @@ q kills the buffer and process."
(mapcar (lambda (pkg)
(cons pkg nil))
(ros-find-executables ros-run-temp-var))
nil nil nil nil ros-run-temp-var)))
nil nil nil nil (list ros-run-temp-var))))
(let* ((name (format "*rosrun:%s/%s" pkg exec))
(buf (get-buffer-create name)))
(save-excursion

2
tools/rosemacs/slime-ros.el
View File

@ -33,7 +33,7 @@
": "))))
(funcall slime-ros-completion-function
prompt (slime-bogus-completion-alist asd-files)
nil nil nil nil default)))
nil nil nil nil (list default))))
(defslime-repl-shortcut slime-repl-load-ros-system ("ros-load-system")
(:handler (lambda ()