[Cscope-cvs] CVS: cscope/contrib/xcscope xcscope.el,1.3,1.4

[Darryl O. <da...@us...>]

Update of /cvsroot/cscope/cscope/contrib/xcscope
In directory usw-pr-cvs1:/tmp/cvs-serv16655

Modified Files:
	xcscope.el 
Log Message:
Last updates (before big changes).


Index: xcscope.el
===================================================================
RCS file: /cvsroot/cscope/cscope/contrib/xcscope/xcscope.el,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** xcscope.el	2000/08/11 20:47:32	1.3
--- xcscope.el	2001/06/28 01:29:23	1.4
***************
*** 7,11 ****
  ; Author:       Darryl Okahata
  ; Created:      Wed Apr 19 17:03:38 2000
! ; Modified:     Fri Aug 11 12:04:25 2000 (Darryl Okahata) da...@so...
  ; Language:     Emacs-Lisp
  ; Package:      N/A
--- 7,11 ----
  ; Author:       Darryl Okahata
  ; Created:      Wed Apr 19 17:03:38 2000
! ; Modified:     Tue Mar 13 11:48:17 2001 (Darryl Okahata) da...@so...
  ; Language:     Emacs-Lisp
  ; Package:      N/A
***************
*** 15,21 ****
  ;
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;; ALPHA VERSION 0.92
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;
  ;; This is a cscope interface for XEmacs.
  ;; It currently runs under Unix only.
--- 15,37 ----
  ;
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;; ALPHA VERSION 0.93
  ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
  ;;
+ ;; This program is free software; you can redistribute it and/or modify
+ ;; it under the terms of the GNU General Public License as published by
+ ;; the Free Software Foundation; either version 2, or (at your option)
+ ;; any later version.
+ ;;
+ ;; This program is distributed in the hope that it will be useful,
+ ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ ;; GNU General Public License for more details.
+ ;;
+ ;; You should have received a copy of the GNU General Public License
+ ;; along with GNU Emacs; see the file COPYING.  If not, write to
+ ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+ ;;
+ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+ ;;
  ;; This is a cscope interface for XEmacs.
  ;; It currently runs under Unix only.
***************
*** 712,715 ****
--- 728,738 ----
  
  
+ (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
    "A list of (DIR . FLAGS) entries.
***************
*** 1113,1117 ****
  	  (if (and cscope-suppress-empty-matches (= cscope-output-start (point)))
  	      (delete-region cscope-item-start (point-max))
! 	    (insert cscope-separator-line))
  	  (setq continue
  		(and cscope-search-list
--- 1136,1144 ----
  	  (if (and cscope-suppress-empty-matches (= cscope-output-start (point)))
  	      (delete-region cscope-item-start (point-max))
! 	    (progn
! 	      (if (not cscope-start-directory)
! 		  (setq cscope-start-directory default-directory))
! 	      (insert cscope-separator-line)
! 	      ))
  	  (setq continue
  		(and cscope-search-list
***************
*** 1138,1141 ****
--- 1165,1170 ----
  	      (setq cscope-process nil
  		    modeline-process ": Search complete")
+ 	      (if cscope-start-directory
+ 		  (setq default-directory cscope-start-directory))
  	      )
  	    ))
***************
*** 1153,1157 ****
  			      (cdr cscope-first-match) window)
  	 ))
!      ( update-window
         (set-window-point window cscope-first-match-point))
       )
--- 1182,1186 ----
  			      (cdr cscope-first-match) window)
  	 ))
!      ( (and update-window cscope-first-match-point)
         (set-window-point window cscope-first-match-point))
       )
***************
*** 1262,1265 ****
--- 1291,1295 ----
  				       (* (car (cdr (cdr times))) 1.0E-6)))))
        (setq default-directory directory
+ 	    cscope-start-directory nil
  	    cscope-search-list (cscope-find-info directory)
  	    cscope-searched-dirs nil
***************
*** 1268,1271 ****
--- 1298,1302 ----
  	    cscope-sentinel-func sentinel-func
  	    cscope-first-match nil
+ 	    cscope-first-match-point nil
  	    cscope-stop-at-first-match-dir-meta (memq t cscope-search-list)
  	    cscope-matched-multiple nil