   (interactive "P")
   (save-buffer)
   (let* ((buf-name buffer-file-name)
-	 (filename (sw::file-to-specware-unit-id buf-name))
+	 (filename (sw::file-to-specware-unit-id buf-name t))
 	 (dir default-directory))
     (lisp-or-specware-command ":swl " "gen-lisp " filename)
     (when compile-and-load?


(defun sw:dired-process-current-file ()
  (interactive)
  (let ((filename (sw::file-to-specware-unit-id (dired-get-filename))))
    (lisp-or-specware-command ":sw " "proc " filename)))

(defun sw:apropos-symbol ()

  (let* ((def-info (car results))
	 (file (cdr def-info))
	 (sort? (member (car def-info) '("Type" "Sort"))))
    (unless (null (cdr results))
      (push (cons 'meta-point (cons sym (cdr results)))
	    *pending-specware-search-results*))
    (setq file (concatenate 'string (strip-hash-suffix file) ".sw"))
    (push-mark (point))
    (let ((buf
