3 files changed, 8 insertions, 11 deletions
diff --git a/lisp/cedet/semantic/symref/filter.el b/lisp/cedet/semantic/symref/filter.el
index 99a629319da..5d166699533 100644
--- a/lisp/cedet/semantic/symref/filter.el
+++ b/lisp/cedet/semantic/symref/filter.el
@@ -103,7 +103,7 @@ tag that contains point, and return that."
       (when (called-interactively-p 'interactive)
 	(message "Found %d occurrences of %s in %.2f seconds"
 		 Lcount (semantic-tag-name target)
-		 (semantic-elapsed-time start (current-time))))
+		 (semantic-elapsed-time start nil)))
       Lcount)))
 
 (defun semantic-symref-rename-local-variable ()
diff --git a/lisp/cedet/semantic/symref/grep.el b/lisp/cedet/semantic/symref/grep.el
index 3653aa9a1e9..caac757d512 100644
--- a/lisp/cedet/semantic/symref/grep.el
+++ b/lisp/cedet/semantic/symref/grep.el
@@ -173,14 +173,16 @@ This shell should support pipe redirect syntax."
 	  ;; find . -type f -print0 | xargs -0 -e grep -nH -e
 	  ;; Note : I removed -e as it is not posix, nor necessary it seems.
 
-	  (let ((cmd (concat "find " default-directory " -type f " filepattern " -print0 "
+	  (let ((cmd (concat "find " (file-local-name rootdir)
+                             " -type f " filepattern " -print0 "
 			     "| xargs -0 grep -H " grepflags "-e " greppat)))
 	    ;;(message "Old command: %s" cmd)
-	    (call-process semantic-symref-grep-shell nil b nil
+	    (process-file semantic-symref-grep-shell nil b nil
                           shell-command-switch cmd)
 	    )
-	(let ((cmd (semantic-symref-grep-use-template rootdir filepattern grepflags greppat)))
-	  (call-process semantic-symref-grep-shell nil b nil
+	(let ((cmd (semantic-symref-grep-use-template
+                    (file-local-name rootdir) filepattern grepflags greppat)))
+	  (process-file semantic-symref-grep-shell nil b nil
                         shell-command-switch cmd))
 	))
     (setq ans (semantic-symref-parse-tool-output tool b))
diff --git a/lisp/cedet/semantic/symref/list.el b/lisp/cedet/semantic/symref/list.el
index 007e86c77d6..50aa5c5740b 100644
--- a/lisp/cedet/semantic/symref/list.el
+++ b/lisp/cedet/semantic/symref/list.el
@@ -114,7 +114,7 @@ Display the references in `semantic-symref-results-mode'."
     (define-key km "+" 'semantic-symref-list-toggle-showing)
     (define-key km "n" 'semantic-symref-list-next-line)
     (define-key km "p" 'semantic-symref-list-prev-line)
-    (define-key km "q" 'semantic-symref-hide-buffer)
+    (define-key km "q" 'quit-window)
     (define-key km "\C-c\C-e" 'semantic-symref-list-expand-all)
     (define-key km "\C-c\C-r" 'semantic-symref-list-contract-all)
     (define-key km "R" 'semantic-symref-list-rename-open-hits)
@@ -193,11 +193,6 @@ Display the references in `semantic-symref-results-mode'."
   (set (make-local-variable 'font-lock-global-modes) nil)
   (font-lock-mode -1))
 
-(defun semantic-symref-hide-buffer ()
-  "Hide buffer with semantic-symref results."
-  (interactive)
-  (bury-buffer))
-
 (defcustom semantic-symref-results-summary-function 'semantic-format-tag-prototype
   "Function to use when creating items in Imenu.
 Some useful functions are found in `semantic-format-tag-functions'."