CVS: setedit/setedit editmain.cc,1.70,1.71 edprj.cc,1.28,1.29

[Salvador E. T. <se...@us...>]

Update of /cvsroot/setedit/setedit/setedit
In directory sc8-pr-cvs1:/tmp/cvs-serv18288/setedit

Modified Files:
	editmain.cc edprj.cc 
Log Message:
* Modified: Now the tags file automagically maintained by the editor can't
be removed manually from the list of tag files. Also: it isn't saved to the
desktop file. Instead when you load a project the file is automatically
inserted.
* Fixed: What Exuberant Ctags claims to be a regex isn't such a thing. For
this reaso any "regex" containing a pointer type (*) fails. For this reason
I changed the way it is used. Now I do a simple search but specifying
"whole words", it can fail, but I think it won't be usual to get a fail.


Index: editmain.cc
===================================================================
RCS file: /cvsroot/setedit/setedit/setedit/editmain.cc,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** editmain.cc	30 Apr 2003 20:28:36 -0000	1.70
--- editmain.cc	5 May 2003 13:45:16 -0000	1.71
***************
*** 1402,1406 ****
      TCEditor *ed=edw->editor;
      ed->lock();
!     ed->SearchAndJump(search,efCaseSensitive | efRegularEx);
      ed->trackCursor(True);
      ed->update(ufView); // Be sure we cleared the last hit
--- 1402,1406 ----
      TCEditor *ed=edw->editor;
      ed->lock();
!     ed->SearchAndJump(search,efCaseSensitive | efWholeWordsOnly);
      ed->trackCursor(True);
      ed->update(ufView); // Be sure we cleared the last hit

Index: edprj.cc
===================================================================
RCS file: /cvsroot/setedit/setedit/setedit/edprj.cc,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** edprj.cc	2 May 2003 19:39:40 -0000	1.28
--- edprj.cc	5 May 2003 13:45:16 -0000	1.29
***************
*** 45,48 ****
--- 45,50 ----
  #include <rhutils.h>
  #include <edspecs.h>
+ #define Uses_TagsOnlyFuncs
+ #include <tags.h>
  
  extern char *ExpandFileNameToThePointWhereTheProgramWasLoaded(const char *s);
***************
*** 108,111 ****
--- 110,114 ----
   int addFile(char *name, ccIndex &pos, int flags=0);
   void analizeReference(const char *filename);
+  char *applyPrjPath(const char *name);
  
  private:
***************
*** 320,323 ****
--- 323,333 ----
  
  
+ char *TPrjItemColl::applyPrjPath(const char *name)
+ {
+  char *dest=NULL;
+  string_cat(dest,referenceCurDelta,DIRSEPARATOR_,name,0);
+  return dest;
+ }
+ 
  extern void OpenFileFromEditor(char *fullName);
  
***************
*** 329,334 ****
   if (ProjectList->referenceCurDelta)
     {// The project was loaded from another directory, not curdir
!     char *dest=NULL;
!     string_cat(dest,ProjectList->referenceCurDelta,DIRSEPARATOR_,st->name,0);
      OpenFileFromEditor(dest);
      string_free(dest);
--- 339,343 ----
   if (ProjectList->referenceCurDelta)
     {// The project was loaded from another directory, not curdir
!     char *dest=ProjectList->applyPrjPath(st->name);
      OpenFileFromEditor(dest);
      string_free(dest);
***************
*** 623,626 ****
--- 632,637 ----
         if (prjWin)
            prjWin->setFileName(name);
+        if (GetAutoGenMode()==stfAutoCentral)
+           ProjectInsertAutoTagFiles();
        }
      if (!f)
***************
*** 858,861 ****
--- 869,874 ----
   TSetEditorApp::edHelper=0;
   prjWin=0;
+  if (GetAutoGenMode()==stfAutoCentral)
+     RemoveAutoGenerated();
   // Load a desktop, but not a project
   if (openDesktop)
***************
*** 1187,1189 ****
--- 1200,1215 ----
  }
  
+ void ProjectInsertAutoTagFiles()
+ {
+  if (!ProjectList)
+     return;
+  if (ProjectList->referenceCurDelta)
+    {
+     char *s=ProjectList->applyPrjPath("tags");
+     InsertAutoGenerated(s);
+     string_free(s);
+    }
+  else
+     InsertAutoGenerated("tags");
+ }