 	 (cscope-show-message (car cscope-first-match)
 			      (cdr cscope-first-match) window)
 	 ))
-     ( update-window
+     ( (and update-window cscope-first-match-point)
        (set-window-point window cscope-first-match-point))
      )
     ))

		    ))
	      (setq cscope-process nil
		    modeline-process ": Search complete")
	      )
	    ))
	(set-buffer-modified-p nil)

(defvar cscope-command-args nil
  "Internal variable for holding major command args to pass to cscope.")
(make-variable-buffer-local 'cscope-command-args)


(defvar cscope-start-directory nil
  "Internal variable used to save the initial start directory.
The results buffer gets reset to this directory when a search has
completely finished.")
(make-variable-buffer-local 'cscope-start-directory)


(defvar cscope-search-list nil
