File jedit-4.2-bsh-2.0b5.patch of Package jedit
Index: jEdit/org/gjt/sp/jedit/gui/DockableWindowManager.java
===================================================================
--- jEdit.orig/org/gjt/sp/jedit/gui/DockableWindowManager.java 2004-06-09 18:48:40.000000000 +0200
+++ jEdit/org/gjt/sp/jedit/gui/DockableWindowManager.java 2009-12-15 13:43:36.169156904 +0100
@@ -524,7 +524,7 @@
try
{
nameSpace.setVariable(
- "position",position);
+ "position",position, true);
}
catch(UtilEvalError e)
{
Index: jEdit/org/gjt/sp/jedit/BeanShell.java
===================================================================
--- jEdit.orig/org/gjt/sp/jedit/BeanShell.java 2004-02-22 21:00:50.000000000 +0100
+++ jEdit/org/gjt/sp/jedit/BeanShell.java 2009-12-15 13:51:35.280157151 +0100
@@ -523,7 +523,7 @@
Object retVal = method.invoke(useNamespace
? new Object[] { namespace }
: NO_ARGS,
- interpForMethods,new CallStack());
+ interpForMethods,new CallStack(), null);
if(retVal instanceof Primitive)
{
if(retVal == Primitive.VOID)
@@ -686,11 +686,11 @@
if(view != null)
{
EditPane editPane = view.getEditPane();
- namespace.setVariable("view",view);
- namespace.setVariable("editPane",editPane);
- namespace.setVariable("buffer",editPane.getBuffer());
- namespace.setVariable("textArea",editPane.getTextArea());
- namespace.setVariable("wm",view.getDockableWindowManager());
+ namespace.setVariable("view",view,true);
+ namespace.setVariable("editPane",editPane,true);
+ namespace.setVariable("buffer",editPane.getBuffer(),true);
+ namespace.setVariable("textArea",editPane.getTextArea(),true);
+ namespace.setVariable("wm",view.getDockableWindowManager(),true);
}
} //}}}
@@ -698,11 +698,11 @@
private static void resetDefaultVariables(NameSpace namespace)
throws UtilEvalError
{
- namespace.setVariable("view",null);
- namespace.setVariable("editPane",null);
- namespace.setVariable("buffer",null);
- namespace.setVariable("textArea",null);
- namespace.setVariable("wm",null);
+ namespace.setVariable("view",null,true);
+ namespace.setVariable("editPane",null,true);
+ namespace.setVariable("buffer",null,true);
+ namespace.setVariable("textArea",null,true);
+ namespace.setVariable("wm",null,true);
} //}}}
//{{{ unwrapException() method
Index: jEdit/org/gjt/sp/jedit/BeanShellAction.java
===================================================================
--- jEdit.orig/org/gjt/sp/jedit/BeanShellAction.java 2003-07-18 01:49:44.000000000 +0200
+++ jEdit/org/gjt/sp/jedit/BeanShellAction.java 2009-12-15 13:52:36.589158753 +0100
@@ -106,7 +106,7 @@
// undocumented hack to allow browser actions to work.
// XXX - clean up in 4.3
- global.setVariable("_comp",comp);
+ global.setVariable("_comp",comp,true);
return Boolean.TRUE.equals(BeanShell.runCachedBlock(
cachedIsSelected,view,
@@ -130,7 +130,7 @@
{
try
{
- global.setVariable("_comp",null);
+ global.setVariable("_comp",null,true);
}
catch(UtilEvalError err)
{
Index: jEdit/org/gjt/sp/jedit/EditServer.java
===================================================================
--- jEdit.orig/org/gjt/sp/jedit/EditServer.java 2004-08-08 05:41:34.000000000 +0200
+++ jEdit/org/gjt/sp/jedit/EditServer.java 2009-12-15 13:53:15.547157082 +0100
@@ -339,7 +339,7 @@
NameSpace ns = new NameSpace(
BeanShell.getNameSpace(),
"EditServer namespace");
- ns.setVariable("socket",client);
+ ns.setVariable("socket",client,true);
BeanShell.eval(null,ns,script);
}
catch(bsh.UtilEvalError e)
@@ -350,7 +350,7 @@
{
try
{
- BeanShell.getNameSpace().setVariable("socket",null);
+ BeanShell.getNameSpace().setVariable("socket",null,true);
}
catch(bsh.UtilEvalError e)
{
Index: jEdit/org/gjt/sp/jedit/browser/VFSBrowser.java
===================================================================
--- jEdit.orig/org/gjt/sp/jedit/browser/VFSBrowser.java 2004-07-14 07:18:50.000000000 +0200
+++ jEdit/org/gjt/sp/jedit/browser/VFSBrowser.java 2009-12-15 13:59:59.779157134 +0100
@@ -1660,8 +1660,8 @@
NameSpace global = BeanShell.getNameSpace();
try
{
- global.setVariable("browser",browser);
- global.setVariable("files",files);
+ global.setVariable("browser",browser,true);
+ global.setVariable("files",files,true);
View view = browser.getView();
// I guess ideally all browsers
@@ -1683,8 +1683,8 @@
{
try
{
- global.setVariable("browser",null);
- global.setVariable("files",null);
+ global.setVariable("browser",null,true);
+ global.setVariable("files",null,true);
}
catch(UtilEvalError err)
{
Index: jEdit/org/gjt/sp/jedit/jEdit.java
===================================================================
--- jEdit.orig/org/gjt/sp/jedit/jEdit.java 2004-08-29 04:58:43.000000000 +0200
+++ jEdit/org/gjt/sp/jedit/jEdit.java 2009-12-15 14:00:54.268157550 +0100
@@ -467,7 +467,7 @@
scriptFile = MiscUtilities.constructPath(userDir,scriptFile);
try
{
- BeanShell.getNameSpace().setVariable("args",args);
+ BeanShell.getNameSpace().setVariable("args",args,true);
}
catch(UtilEvalError e)
{
Index: jEdit/org/gjt/sp/jedit/search/SearchAndReplace.java
===================================================================
--- jEdit.orig/org/gjt/sp/jedit/search/SearchAndReplace.java 2004-08-08 05:41:34.000000000 +0200
+++ jEdit/org/gjt/sp/jedit/search/SearchAndReplace.java 2009-12-15 14:01:30.725157050 +0100
@@ -1197,7 +1197,7 @@
for(int i = 0; i < occur.substitutions.length; i++)
{
replaceNS.setVariable("_" + i,
- occur.substitutions[i]);
+ occur.substitutions[i],true);
}
Object obj = BeanShell.runCachedBlock(
@@ -1279,7 +1279,7 @@
private static String literalBeanShellReplace(String found)
throws Exception
{
- replaceNS.setVariable("_0",found);
+ replaceNS.setVariable("_0",found,true);
Object obj = BeanShell.runCachedBlock(
replaceMethod,
null,replaceNS);
