Mercurial > octave-nkf
changeset 7073:66c6cab344f7
[project @ 2007-10-26 16:09:12 by jwe]
| author | jwe |
|---|---|
| date | Fri, 26 Oct 2007 16:09:12 +0000 |
| parents | b48d486f641d |
| children | 87151f298e6a |
| files | scripts/ChangeLog scripts/pkg/pkg.m scripts/startup/main-rcfile |
| diffstat | 3 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Fri Oct 26 15:52:58 2007 +0000 +++ b/scripts/ChangeLog Fri Oct 26 16:09:12 2007 +0000 @@ -1,3 +1,7 @@ +2007-10-26 John W. Eaton <jwe@octave.org> + + * pkg/pkg.m: Delete PKG_ADD directive for autoloading packes. + 2007-10-25 John W. Eaton <jwe@octave.org> * miscellaneous/compare_versions.m: Style fixes.
--- a/scripts/pkg/pkg.m Fri Oct 26 15:52:58 2007 +0000 +++ b/scripts/pkg/pkg.m Fri Oct 26 16:09:12 2007 +0000 @@ -173,7 +173,6 @@ ## @end deftypefn ## PKG_ADD: mark_as_command pkg -## PKG_ADD: pkg ("load", "auto"); function [local_packages, global_packages] = pkg (varargin) ## Installation prefix (XXX: what should these be on windows?)
--- a/scripts/startup/main-rcfile Fri Oct 26 15:52:58 2007 +0000 +++ b/scripts/startup/main-rcfile Fri Oct 26 16:09:12 2007 +0000 @@ -13,3 +13,8 @@ if (strcmp (PAGER (), "less") && isempty (getenv ("LESS"))) PAGER_FLAGS ('-e -X -P"-- less ?pB(%pB\\%):--. (f)orward, (b)ack, (q)uit$"'); endif + +## This appears here instead of in the pkg/PKG_ADD file so that --norc +## will also skip automatic loading of packages. + +pkg ("load", "auto");