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

Fixed a bug in rosemacs on emacs22. 

ROS-COMPLETING-READ-MESSAGE, ROS-COMPLETING-READ-SERVICE and
ROS-COMPLETING-READ-TOPIC need to explicitly convert vectors to
lists. Old emacs is not robust against a wrong datatype.
This commit is contained in:
Lorenz Moesenlechner 2010-05-09 00:04:42 +00:00
parent 6c3453b726
commit 570d7377aa
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tools/rosemacs/rosemacs.el
View File

@ -332,15 +332,15 @@
(defun ros-completing-read-message (prompt &optional default)
(unless ros-messages
(cache-ros-message-locations))
(let ((result (funcall ros-completion-function prompt
(map 'list
(lambda (m pkg)
(cons (if (> (count m ros-messages :test 'equal) 1)
(format "%s (%s)" m pkg)
m)
nil))
ros-messages ros-message-packages)
nil nil nil nil (when (member default ros-messages)
(let* ((ros-messages-list (map 'list 'identity ros-messages))
(result (funcall ros-completion-function prompt
(map 'list (lambda (m pkg)
(cons (if (> (count m ros-messages-list :test 'equal) 1)
(format "%s (%s)" m pkg)
m)
nil))
ros-messages-list ros-message-packages)
nil nil nil nil (when (member default ros-messages-list)
default))))
(substring result 0 (position ?\s result))))
@ -356,7 +356,7 @@
m)
nil))
ros-services ros-service-packages)
nil nil nil nil (when (member default ros-services)
nil nil nil nil (when (member default (map 'list 'identity ros-services))
default))))
(substring result 0 (position ?\s result))))
@ -364,7 +364,7 @@
(funcall ros-completion-function prompt (map 'list (lambda (m)
(cons m nil))
ros-all-topics)
nil nil nil nil (when (member default ros-all-topics)
nil nil nil nil (when (member default (map 'list 'identity ros-all-topics))
default)))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;