Mercurial > hg > octave-nkf
comparison src/defaults.cc @ 5395:8db4eb48f546
[project @ 2005-06-16 20:19:18 by jwe]
author | jwe |
---|---|
date | Thu, 16 Jun 2005 20:19:19 +0000 |
parents | ac8d64b9e76a |
children | b12c0f920da0 |
comparison
equal
deleted
inserted
replaced
5394:256dde4f6aea | 5395:8db4eb48f546 |
---|---|
46 #include "defun.h" | 46 #include "defun.h" |
47 #include "error.h" | 47 #include "error.h" |
48 #include "file-ops.h" | 48 #include "file-ops.h" |
49 #include "gripes.h" | 49 #include "gripes.h" |
50 #include "help.h" | 50 #include "help.h" |
51 #include "input.h" | |
51 #include "oct-obj.h" | 52 #include "oct-obj.h" |
52 #include "ov.h" | 53 #include "ov.h" |
53 #include "parse.h" | 54 #include "parse.h" |
54 #include "toplev.h" | 55 #include "toplev.h" |
55 #include "unwind-prot.h" | 56 #include "unwind-prot.h" |
570 if (s.empty ()) | 571 if (s.empty ()) |
571 { | 572 { |
572 gripe_invalid_value_specified ("LOADPATH"); | 573 gripe_invalid_value_specified ("LOADPATH"); |
573 status = -1; | 574 status = -1; |
574 } | 575 } |
575 else | 576 else if (Vload_path != s) |
576 { | 577 { |
577 // I'm not sure whether this causes more problems that it | 578 // I'm not sure whether this causes more problems that it |
578 // solves... | 579 // solves... |
579 // if (! (s[0] == ':' || s[s.length () - 1] == ':' | 580 // if (! (s[0] == ':' || s[s.length () - 1] == ':' |
580 // || s.find ("::") != NPOS)) | 581 // || s.find ("::") != NPOS)) |
581 // warning ("LOADPATH will ignore default load path"); | 582 // warning ("LOADPATH will ignore default load path"); |
582 | 583 |
583 Vload_path = s; | 584 Vload_path = s; |
585 | |
586 // By resetting the last prompt time variable, we will force | |
587 // checks for out of date symbols even if the change to LOADPATH | |
588 // and subsequent function calls happen between prompts. | |
589 | |
590 // XXX FIXME XXX -- maybe we should rename | |
591 // Vlast_prompt_time_stamp since the new usage doesn't really | |
592 // fit with the current name? | |
593 | |
594 Vlast_prompt_time.stamp (); | |
584 | 595 |
585 update_load_path_dir_path (); | 596 update_load_path_dir_path (); |
586 } | 597 } |
587 | 598 |
588 return status; | 599 return status; |