   "Open definition of a ros message in view mode.  If used interactively, tab completion will work."
   (interactive (list (ros-completing-read-message
                       "Enter message name"
-                      (current-word t t))))
+                      (current-ros-word))))
   (let ((max-mini-window-height 0))
     (shell-command (format "rosmsg show %s" message))))
 

  "Open definition of a ros service.  If used interactively, tab completion will work."
  (interactive (list (ros-completing-read-service
                      "Enter service name"
                      (current-word t t))))
  (let* ((p+m (split-string service "/"))
         (p (if (cdr p+m)
                (car p+m)

  "Open definition of a ros message.  If used interactively, tab completion will work."
  (interactive (list (ros-completing-read-message
                      "Enter message name"
                      (current-ros-word))))
  (let* ((p+m (split-string message "/"))
         (p (if (cdr p+m)
                (car p+m)
