src/Tools/jEdit/patches/vfs_marker
changeset 82427 1c646ad68bd8
parent 82414 e9ec8daa7888
child 82625 0fa6759948bc
--- a/src/Tools/jEdit/patches/vfs_marker	Fri Apr 04 11:21:01 2025 +0200
+++ b/src/Tools/jEdit/patches/vfs_marker	Fri Apr 04 11:37:27 2025 +0200
@@ -71,16 +71,7 @@
  	{
 diff -ru jedit5.7.0/jEdit/org/gjt/sp/jedit/jEdit.java jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/jEdit.java
 --- jedit5.7.0/jEdit/org/gjt/sp/jedit/jEdit.java	2024-08-03 19:53:14.000000000 +0200
-+++ jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/jEdit.java	2025-04-02 21:46:10.377166514 +0200
-@@ -1553,7 +1553,7 @@
- 		{
- 			if (arg == null)
- 				continue;
--			else if (arg.startsWith("+line:") || arg.startsWith("+marker:"))
-+			else if (arg.startsWith("+offset:") || arg.startsWith("+line:") || arg.startsWith("+marker:"))
- 			{
- 				if (lastBuffer != null)
- 					gotoMarker(view, lastBuffer, arg);
++++ jedit5.7.0-patched/jEdit/org/gjt/sp/jedit/jEdit.java	2024-10-29 11:50:54.062016616 +0100
 @@ -4233,7 +4233,7 @@
  	} //}}}
  
@@ -90,32 +81,3 @@
  		final String marker)
  	{
  		AwtRunnableQueue.INSTANCE.runAfterIoTasks(new Runnable()
-@@ -4243,8 +4243,27 @@
- 			{
- 				int pos;
- 
-+				// Handle offset
-+				if(marker.startsWith("+offset:"))
-+				{
-+					try
-+					{
-+						String arg = marker.substring(8);
-+						int offset = parseInt(arg);
-+						if (0 <= offset && offset <= buffer.getLength()) {
-+							pos = offset;
-+						}
-+						else {
-+							return;
-+						}
-+					}
-+					catch(Exception e)
-+					{
-+						return;
-+					}
-+				}
- 				// Handle line number
--				if(marker.startsWith("+line:"))
-+				else if(marker.startsWith("+line:"))
- 				{
- 					try
- 					{