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

	  (error "Can't find definition of %s in %s" qsym file)))
    (beginning-of-line)
    (recenter 4)
    (when (not (null (cdr *pending-specware-meta-point-results*)))
      (message "%S more definitions."
	       (length (cdr *pending-specware-meta-point-results*))))))

;; (defvar *specware-context-str* "cl-user::*specware-global-context*")
(defvar *specware-context-str* "(MonadicStateInternal::readGlobalVar \"GlobalContext\")")


(defun sw:set-swe-spec ()
  (interactive)
  (let ((filename (sw:containing-specware-unit-id t)))
    (lisp-or-specware-command ":swe-spec " "ctext " filename)))

(defun sw:cl-unit (unitid)
  (interactive (list (read-from-minibuffer "Compile and Load Unit: "
					   (sw::file-to-specware-unit-id
					    buffer-file-name t))))
  (save-buffer)
  (let ((temp-file-name (concat (temp-directory) "-cl-current-file")))
    (if (member (sw:eval-in-lisp
