Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix non-existent symbols #32

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions rosemacs/rosemacs.el
Original file line number Diff line number Diff line change
Expand Up @@ -392,13 +392,13 @@
(cl-subseq word (1+ index)))
word)))

(setq topic-completor (dynamic-completion-table
(setq topic-completor (completion-table-dynamic
(lambda (str) (rosemacs-bsearch str ros-all-topics))))
(setq node-completor (dynamic-completion-table
(setq node-completor (completion-table-dynamic
(lambda (str) (rosemacs-bsearch str rosemacs/nodes-vec))))
(setq ros-package-completor
;; Longer because it has to deal with the case of PACKAGE/PATH-PREFIX in addition to PACKAGE-PREFIX
(dynamic-completion-table
(completion-table-dynamic
(lambda (str)
(unless ros-packages (ros-load-package-locations))
(cl-multiple-value-bind (package dir-prefix dir-suffix) (parse-ros-file-prefix str)
Expand Down Expand Up @@ -847,7 +847,7 @@ parameter."
(let ((current-nodes nil))
(while (re-search-forward "^\\/\\(.*\\)$" nil t)
(when (> (match-end 0) finish)
(return))
(cl-return))
(push (match-string 1) current-nodes))
(let ((sorted-nodes (cl-sort current-nodes 'string<)))
(cl-destructuring-bind (added deleted)
Expand Down Expand Up @@ -1392,7 +1392,7 @@ else if not published yet, return the number -1, else return nil"
(if pos
(let ((str (match-string 1)))
(push str ros-run-exec-paths))
(return)))))))
(cl-return)))))))
(cl-sort (cl-map 'vector 'extract-exec-name ros-run-exec-paths) 'string<)))

(defun ros-package-file-full-path (pkg file)
Expand Down Expand Up @@ -1625,10 +1625,10 @@ With prefix arg, allows editing rosmake command before starting."
(defun ros-launch-current ()
(interactive)
(let ((path (buffer-file-name)))
(assert (and path (string-match ".*\\/\\([^\\/]*\.launch\\)" path)))
(cl-assert (and path (string-match ".*\\/\\([^\\/]*\.launch\\)" path)))
(let* ((filename (match-string 1 path))
(pkg (ros-package-for-path path)))
(assert (and pkg filename))
(cl-assert (and pkg filename))
(let ((name (format "roslaunch:%s/%s" pkg filename)))
(if (rosemacs/contains-running-process name)
(switch-to-buffer (get-buffer name))
Expand Down