Menu
▾
▴
[ jEdit-commits ] [ jEdit core ] jEdit core branch master updated. v5.7.0-64-g01c732d64
|
From: vampire0 <vam...@us...> - 2025-04-08 23:05:44
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "jEdit core".
The branch, master has been updated
via 01c732d64823f7e70e5bcc3fcb3f7ea6b7207bb8 (commit)
via f90aa5ae8569de399c515332a1c9ba4fabfff230 (commit)
via a6c2d768009a4900981da51203451d01d44cf33a (commit)
via 74944041504cb27c50b4a20a43197e9d5020f25a (commit)
via ae921958a37a449784927572d36fcdfb5707fc13 (commit)
via c97ae42442d3a3d029eef2f2484ddc65e07228a0 (commit)
via 8681fcc3c202941f9a0eee3284e4b48cbec18fad (commit)
via 2ea6546fba6c8c69d46c343aea55834e3456cd8e (commit)
via 4e4019292de66fd7b21aad35200af5662e8554b3 (commit)
via 1a610ef0ce3c330924e8a03035eb063e7ac7b9ae (commit)
via f0db4d6ff6ba078e2ecfcd52964becaa905af776 (commit)
via 3dd2bd6df734ad819ea4de1cb56616c698b4e420 (commit)
via e73d8bfd46e7d0dba2371c1bad82a89a7aa12ba9 (commit)
via 56c114e62466fab661da48df7e4cfdc0447badc5 (commit)
via 017ec7539642815f0c6bce0bec490d0c54546e77 (commit)
via be1f3b17bb2227e9f03d9a011d4c07d53a72b0c1 (commit)
via 81f45c471074fffbfddfc938920a520e597f2a4d (commit)
via 0bb7354c0e0fb4431362d3675c9f816bde13b528 (commit)
via 8a3a08cbfe0e07089fe98c4271e90094c0f99f86 (commit)
via ead082106f91fe8001a4603601a314cb6c7cde99 (commit)
via 8ffb88ae8d33fb11d8c8d62134072ca6eb8219d3 (commit)
via c3bbc112c4ae94ab5545867b491ba321e26d2c1f (commit)
via d0a5940c7734893042f35147d4803b082970699c (commit)
via 914ecf230017c5643fe01af4e0ed135f0b83fa5e (commit)
via eb06fbf6e04eb7b17a4c1e8c21dd7fa1966537da (commit)
via c03bd7f906605b5b04b7e24d6ddbda469fb9d3d6 (commit)
via a9f91f99f22d69e07a0634b75891920d978910f2 (commit)
via c1da40a90c3cef359de4adc8f0687a9f54d4cee8 (commit)
via a825f547870d7cf91e0cd551991ef6164d147367 (commit)
via 35b8392c2bbb6f6c190f92f851fa09e8e014c2e8 (commit)
via 2d166de5cab01ce622f09811d5f76178ec5b2be4 (commit)
via ec6abdaf8a7b2272b54139f905f900a4cae1e94f (commit)
from e6f81220794a325f7c23f4e346574a32e1d42611 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit: https://sourceforge.net/p/jedit/jEdit/ci/01c732d64823f7e70e5bcc3fcb3f7ea6b7207bb8/
tree: https://sourceforge.net/p/jedit/jEdit/ci/01c732d64823f7e70e5bcc3fcb3f7ea6b7207bb8/tree/
commit 01c732d64823f7e70e5bcc3fcb3f7ea6b7207bb8
Author: Björn Kautler <Bj...@Ka...>
Date: Wed Apr 9 01:04:01 2025 +0200
Properly set the normative doctype in the doc files
diff --git a/doc/FAQ/faq-contrib.xml b/doc/FAQ/faq-contrib.xml
index a6c5d74f7..b71bb8473 100644
--- a/doc/FAQ/faq-contrib.xml
+++ b/doc/FAQ/faq-contrib.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="appendix">
<title>Contributors</title>
<!-- jEdit buffer-local properties: -->
diff --git a/doc/FAQ/faq-general.xml b/doc/FAQ/faq-general.xml
index 5b5d98565..46bb30c3e 100644
--- a/doc/FAQ/faq-general.xml
+++ b/doc/FAQ/faq-general.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<section id="general">
<title>General Questions</title>
<!-- jEdit buffer-local properties: -->
diff --git a/doc/FAQ/faq-install.xml b/doc/FAQ/faq-install.xml
index 7a88f7729..04bdf690e 100644
--- a/doc/FAQ/faq-install.xml
+++ b/doc/FAQ/faq-install.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<section id="installation">
<title>Installation Questions</title>
<!-- jEdit buffer-local properties: -->
diff --git a/doc/FAQ/faq-intro.xml b/doc/FAQ/faq-intro.xml
index dfb99e455..3e272312c 100644
--- a/doc/FAQ/faq-intro.xml
+++ b/doc/FAQ/faq-intro.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<section id="intro">
<title>Introduction</title>
<!-- jEdit buffer-local properties: -->
@@ -22,4 +23,4 @@
<para>Each section of this document deals with a different category of
topics, and each begins with a listing of the questions covered. This should
allow you to find the information you are seeking quickly.</para>
-</section>
\ No newline at end of file
+</section>
diff --git a/doc/FAQ/faq-macros.xml b/doc/FAQ/faq-macros.xml
index c155df642..54355e013 100644
--- a/doc/FAQ/faq-macros.xml
+++ b/doc/FAQ/faq-macros.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<section id="macros">
<title>Macros</title>
<!-- jEdit buffer-local properties: -->
@@ -124,4 +125,4 @@
</qandaentry>
</qandadiv>
</qandaset>
-</section>
\ No newline at end of file
+</section>
diff --git a/doc/FAQ/faq-plugins.xml b/doc/FAQ/faq-plugins.xml
index 892ee8627..5ff54cd33 100644
--- a/doc/FAQ/faq-plugins.xml
+++ b/doc/FAQ/faq-plugins.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<section id="plugins">
<title>Plugin Questions</title>
<!-- jEdit buffer-local properties: -->
@@ -180,4 +181,4 @@
</qandaentry>
</qandadiv>
</qandaset>
-</section>
\ No newline at end of file
+</section>
diff --git a/doc/FAQ/faq-problems.xml b/doc/FAQ/faq-problems.xml
index 66d9a9363..e993dbf1b 100644
--- a/doc/FAQ/faq-problems.xml
+++ b/doc/FAQ/faq-problems.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<section id="problems">
<title>Problems</title>
<!-- jEdit buffer-local properties: -->
diff --git a/doc/FAQ/faq-use.xml b/doc/FAQ/faq-use.xml
index 209188d89..acadb4c60 100644
--- a/doc/FAQ/faq-use.xml
+++ b/doc/FAQ/faq-use.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<section id="usage">
<title>Usage Questions</title>
diff --git a/doc/FAQ/faq.xml b/doc/FAQ/faq.xml
index 0e52624b9..f4e9534c1 100644
--- a/doc/FAQ/faq.xml
+++ b/doc/FAQ/faq.xml
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<!-- jEdit buffer-local properties: -->
<!-- :indentSize=2 -->
<!-- jEdit FAQ -->
<!-- Command line for processing: -->
<!-- -->
<!-- xsltproc -xinclude -output .\html\ faq.xsl faq.xml -->
-<article class="faq" id="faq"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:noNamespaceSchemaLocation="https://www.docbook.org/xsd/4.4/docbook.xsd">
+<article class="faq" id="faq" xmlns:xi="http://www.w3.org/2001/XInclude">
<articleinfo>
<author>
@@ -106,4 +106,4 @@
<xi:include href="faq-plugins.xml" />
<xi:include href="faq-problems.xml" />
<xi:include href="faq-contrib.xml" />
-</article>
\ No newline at end of file
+</article>
diff --git a/doc/users-guide/activity-log.xml b/doc/users-guide/activity-log.xml
index 28144e2e3..7825e00e0 100644
--- a/doc/users-guide/activity-log.xml
+++ b/doc/users-guide/activity-log.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="activity-log">
<!-- jEdit buffer-local properties: -->
<!-- :indentSize=2:noTabs=true: -->
@@ -55,7 +55,7 @@
The <guibutton>Settings</guibutton> button in the Activity Log window
shows a dialog that lets
you adjust the output colors, filter the messages by type, and lets you set
- the maximum number of lines to display. Note that larger numbers will
+ the maximum number of lines to display. Note that larger numbers will
decrease the overall performance of jEdit since these lines are kept in
memory.
</para>
@@ -65,7 +65,7 @@
It allows for catching problems right after they show up.
Each error message entry is accompanied by a system beep.
Lower priority entries may be alerted this way, if the
- <userinput>log</userinput> option is used,
+ <userinput>log</userinput> option is used,
see <xref linkend="cli-usage" />.
</para>
-</appendix>
\ No newline at end of file
+</appendix>
diff --git a/doc/users-guide/basics.xml b/doc/users-guide/basics.xml
index dd43c2316..7f4f5d42d 100644
--- a/doc/users-guide/basics.xml
+++ b/doc/users-guide/basics.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="basics">
<title>jEdit Basics</title>
<!-- jEdit buffer-local properties: -->
diff --git a/doc/users-guide/bsh-commands.xml b/doc/users-guide/bsh-commands.xml
index fd2320da9..5c75602d9 100644
--- a/doc/users-guide/bsh-commands.xml
+++ b/doc/users-guide/bsh-commands.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="bsh-commands">
<!-- jEdit buffer local properties:
:indentSize=2:noTabs=yes:maxLineLen=90:tabSize=2:
@@ -715,4 +716,4 @@ crufties.counter = 5;
</listitem>
</itemizedlist>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/users-guide/conventions.xml b/doc/users-guide/conventions.xml
index c7d3b120a..a24348198 100644
--- a/doc/users-guide/conventions.xml
+++ b/doc/users-guide/conventions.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="conventions">
<title>Conventions</title>
<!-- jEdit buffer-local properties: -->
@@ -92,7 +93,7 @@
Pressing this letter in combination with the
<keycap>Alt</keycap> key activates the associated user
interface widget. The "F10" key can also be pressed to put
- focus on the menu bar, it has the same functionality as the
+ focus on the menu bar, it has the same functionality as the
Alt key in Windows. Note that this functionality is not
available on macOS with the <quote>macOS Adaptive</quote>
look and feel. See <xref linkend="appearance-pane" /> for
diff --git a/doc/users-guide/customizing.xml b/doc/users-guide/customizing.xml
index 865953554..16dfbe5db 100644
--- a/doc/users-guide/customizing.xml
+++ b/doc/users-guide/customizing.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="customizing">
<title>Customizing jEdit</title>
<!-- jEdit buffer-local properties: -->
diff --git a/doc/users-guide/dialog-macro.xml b/doc/users-guide/dialog-macro.xml
index 7e5db26bf..f85f49c1c 100644
--- a/doc/users-guide/dialog-macro.xml
+++ b/doc/users-guide/dialog-macro.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="dialog-macro">
<title>A Dialog-Based Macro</title>
<!-- jEdit 4.x Macro Guide, (C) 2001, 2002 John Gellene -->
@@ -636,4 +637,4 @@ prefixSuffixDialog();</programlisting>
techniques.</para>
</section>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/users-guide/files.xml b/doc/users-guide/files.xml
index abd17fdcc..be4c2a916 100644
--- a/doc/users-guide/files.xml
+++ b/doc/users-guide/files.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="files">
<title>Working With Files</title>
diff --git a/doc/users-guide/globs.xml b/doc/users-guide/globs.xml
index 0fc7c4e35..c87a1cdd4 100644
--- a/doc/users-guide/globs.xml
+++ b/doc/users-guide/globs.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="globs">
<title>Glob Patterns</title>
@@ -134,4 +135,4 @@
<para>If you need to match files that begin with the glob-translate-disable
prefix <literal>(re)</literal>, you can escape it with a leading backslash
and the metacharacters will be translated into globs as before.</para>
-</appendix>
\ No newline at end of file
+</appendix>
diff --git a/doc/users-guide/history.xml b/doc/users-guide/history.xml
index a85a37dc5..d0b6e11ec 100644
--- a/doc/users-guide/history.xml
+++ b/doc/users-guide/history.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="history">
<title>History Text Fields</title>
<!-- jEdit buffer-local properties: -->
@@ -42,4 +43,4 @@
button, although right-click will still show you the history as a
context menu.</para>
</note>
-</appendix>
\ No newline at end of file
+</appendix>
diff --git a/doc/users-guide/installing-modes.xml b/doc/users-guide/installing-modes.xml
index 7ab902f72..14378fcff 100644
--- a/doc/users-guide/installing-modes.xml
+++ b/doc/users-guide/installing-modes.xml
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="installing-modes">
<title>Installing Edit Modes</title>
<!-- jEdit buffer-local properties: -->
<!-- :indentSize=2:noTabs=true: -->
<!-- :xml.root=users-guide.xml: -->
- <para>The easiest way to install a new mode locally is to use the Editing
+ <para>The easiest way to install a new mode locally is to use the Editing
dialog found under Utilities - Global Options. At the bottom of this dialog
is an "Add Mode" button. Clicking this button shows a dialog to add a mode
to jEdit. Simply fill in the blanks and the mode file will be put in the
@@ -63,11 +64,11 @@
<listitem>
<para><literal>FILE_NAME_GLOB</literal> - files whose names match
this glob pattern will be opened in this edit mode.
- This can also specify full paths, if the glob pattern contains a
- path separator character. <literal>FILE_NAME_GLOB</literal> can be
- specified in the <literal>modes/catalog</literal> file, or the mode
- file itself. See the <literal>FILE_NAME_GLOB</literal> for
- <literal>apacheconf.xml</literal> in <literal>modes/catalog</literal>
+ This can also specify full paths, if the glob pattern contains a
+ path separator character. <literal>FILE_NAME_GLOB</literal> can be
+ specified in the <literal>modes/catalog</literal> file, or the mode
+ file itself. See the <literal>FILE_NAME_GLOB</literal> for
+ <literal>apacheconf.xml</literal> in <literal>modes/catalog</literal>
for an example of full path filename globbing.
</para>
</listitem>
@@ -95,4 +96,4 @@
<listitem><para> the filename matches the <literal>FILE_NAME_GLOB</literal> </para></listitem>
<listitem><para> the first line of the file matches the <literal>FIRST_LINE_GLOB</literal></para></listitem>
</orderedlist>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/users-guide/launcher-guide.xml b/doc/users-guide/launcher-guide.xml
index 5bc8b7cd9..a1972179e 100644
--- a/doc/users-guide/launcher-guide.xml
+++ b/doc/users-guide/launcher-guide.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<!-- :xml.root=users-guide.xml: -->
<appendix id="launcher-guide">
<title>jEditLauncher for Windows</title>
@@ -533,4 +534,4 @@ o.RunDiff(path + "Search.bsh", path + "Search2.bsh")
source code or other materials used in the creation of
jEditLauncher.</para>
</section>
-</appendix>
\ No newline at end of file
+</appendix>
diff --git a/doc/users-guide/macro-basics.xml b/doc/users-guide/macro-basics.xml
index e77d70ff9..0b018762f 100644
--- a/doc/users-guide/macro-basics.xml
+++ b/doc/users-guide/macro-basics.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="macro-basics">
<title>Macro Basics</title>
<!-- jEdit buffer-local properties: -->
@@ -757,4 +758,4 @@ String result = df.format(d);
</listitem>
</itemizedlist>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/users-guide/macro-index.xml b/doc/users-guide/macro-index.xml
index f68f724dc..04c74f107 100644
--- a/doc/users-guide/macro-index.xml
+++ b/doc/users-guide/macro-index.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="macro-index">
<title>Macros Included With jEdit</title>
<!-- jEdit 4.0 Macro Guide, (C) 2001 John Gellene -->
diff --git a/doc/users-guide/macro-tips.xml b/doc/users-guide/macro-tips.xml
index b91746aae..242dd0aa4 100644
--- a/doc/users-guide/macro-tips.xml
+++ b/doc/users-guide/macro-tips.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="macro-tips">
<title>Macro Tips and Techniques</title>
<!-- jEdit buffer-local properties: -->
@@ -903,4 +904,4 @@ Log.log(Log.DEBUG, BeanShell.class, "counter = " + counter);
</sidebar>
</section>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/users-guide/plugin-implement.xml b/doc/users-guide/plugin-implement.xml
index dfce63a07..836ad4308 100644
--- a/doc/users-guide/plugin-implement.xml
+++ b/doc/users-guide/plugin-implement.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="plugin-implement">
<!-- jEdit buffer-local properties: -->
<!-- :xml.root=users-guide.xml: -->
@@ -1285,4 +1286,4 @@ else if(msg instanceof ViewUpdate) {
<para> This section is new but will be expanded shortly. Please post suggestions to the <literal>jedit-devel</literal> mailing list. </para>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/users-guide/plugin-intro.xml b/doc/users-guide/plugin-intro.xml
index e9ec8a165..41c41df04 100644
--- a/doc/users-guide/plugin-intro.xml
+++ b/doc/users-guide/plugin-intro.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="plugin-intro">
<title>Introducing the Plugin API</title>
<!-- :indentSize=2:tabSize=2:noTabs=true:wrap=soft:maxLineLen=90: -->
diff --git a/doc/users-guide/plugin-tips.xml b/doc/users-guide/plugin-tips.xml
index eeccbf67a..23db636c1 100644
--- a/doc/users-guide/plugin-tips.xml
+++ b/doc/users-guide/plugin-tips.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="plugin-tips">
<title>Plugin Tips and Techniques</title>
<!-- jEdit buffer-local properties: -->
@@ -7,26 +8,26 @@
<section id="utility-classes">
<title> Utility Classes </title>
-
- <para> If you need to check what the current running platform is,
+
+ <para> If you need to check what the current running platform is,
see <classname>org.gjt.sp.jedit.OperatingSystem</classname>. </para>
-
+
<para> If you need to compare file names and don't want to
- worry about whether you are on a case-sensitive file system or not,
+ worry about whether you are on a case-sensitive file system or not,
use <function>MiscUtilities.pathsEqual()</function>. See that
class for other useful path manipulation routines. </para>
<para> There are other helpful classes in <package>org.gjt.sp.util</package>,
such as <classname>HtmlUtilities</classname>, <classname>StandardUtilities</classname>,
- <classname>IOUtilities</classname>, and <classname>Log</classname>.
- In particular, the <classname>Log</classname> class is recommended
- for reporting errors and also logging debug information.
+ <classname>IOUtilities</classname>, and <classname>Log</classname>.
+ In particular, the <classname>Log</classname> class is recommended
+ for reporting errors and also logging debug information.
</para>
- <para> If your plugin needs to "find a word" (using word boundaries) somewhere
+ <para> If your plugin needs to "find a word" (using word boundaries) somewhere
in the buffer, you might want to reuse the <classname>org.gjt.sp.jedit.TextUtilities</classname>
class. </para>
-
+
</section>
<section id="plugin-tips-libraries">
diff --git a/doc/users-guide/regexps.xml b/doc/users-guide/regexps.xml
index 956670d5a..786c2b3d8 100644
--- a/doc/users-guide/regexps.xml
+++ b/doc/users-guide/regexps.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="regexps">
<title>Regular Expressions</title>
<!-- jEdit buffer-local properties: -->
diff --git a/doc/users-guide/shortcuts.xml b/doc/users-guide/shortcuts.xml
index 1a491239f..6c0288fc5 100644
--- a/doc/users-guide/shortcuts.xml
+++ b/doc/users-guide/shortcuts.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE appendix PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<appendix id="shortcuts">
<title>Keyboard Shortcuts</title>
<!-- This is for the default jEdit keymap. Do we really need this? -->
diff --git a/doc/users-guide/source-edit.xml b/doc/users-guide/source-edit.xml
index 8985cf56d..e390a2201 100644
--- a/doc/users-guide/source-edit.xml
+++ b/doc/users-guide/source-edit.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="source-edit">
<title>Editing Source Code</title>
<!-- jEdit buffer-local properties: -->
@@ -760,4 +761,4 @@ With text inside it.
that were hidden as a result of narrowing.</para>
</section>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/users-guide/starting.xml b/doc/users-guide/starting.xml
index f62ed1f6b..ed56b5be2 100644
--- a/doc/users-guide/starting.xml
+++ b/doc/users-guide/starting.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="starting">
<title>Starting jEdit</title>
<!-- jEdit buffer-local properties: -->
diff --git a/doc/users-guide/text-edit.xml b/doc/users-guide/text-edit.xml
index dfed12449..3dd98ff12 100644
--- a/doc/users-guide/text-edit.xml
+++ b/doc/users-guide/text-edit.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="editing">
<title>Editing Text</title>
<!-- jEdit buffer-local properties:
@@ -1354,4 +1355,4 @@
the search bar or give it keyboard focus.</para>
</section>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/users-guide/updating-modes.xml b/doc/users-guide/updating-modes.xml
index d305df6a4..4d7d11c85 100644
--- a/doc/users-guide/updating-modes.xml
+++ b/doc/users-guide/updating-modes.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="updating-modes">
<title>Updating Edit Modes</title>
<!-- jEdit buffer-local properties: -->
diff --git a/doc/users-guide/users-guide.xml b/doc/users-guide/users-guide.xml
index d9536f98d..3dec029ef 100644
--- a/doc/users-guide/users-guide.xml
+++ b/doc/users-guide/users-guide.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<!-- jEdit buffer-local properties: -->
<!-- maxLineLen=90:wrap=soft:indentSize=2:noTabs=true: -->
<!-- jEdit user's guide -->
-<book id="users-guide"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xi="http://www.w3.org/2001/XInclude" xsi:noNamespaceSchemaLocation="https://www.docbook.org/xsd/4.4/docbook.xsd">
+<book id="users-guide" xmlns:xi="http://www.w3.org/2001/XInclude">
<bookinfo>
<title>jEdit 5.7 User's Guide</title>
@@ -142,4 +142,4 @@
<xi:include href="plugin-tips.xml" />
</part>
-</book>
\ No newline at end of file
+</book>
diff --git a/doc/users-guide/using-macros.xml b/doc/users-guide/using-macros.xml
index 184e75124..b7a43fb47 100644
--- a/doc/users-guide/using-macros.xml
+++ b/doc/users-guide/using-macros.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="using-macros">
<title>Using Macros</title>
<!-- jEdit buffer-local properties: -->
@@ -181,4 +182,4 @@
<guimenu>Macros</guimenu>><guimenuitem>Rescan Macros</guimenuitem>
command to update the macro list.</para>
</section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/users-guide/using-plugins.xml b/doc/users-guide/using-plugins.xml
index 79bfddef1..ffce07820 100644
--- a/doc/users-guide/using-plugins.xml
+++ b/doc/users-guide/using-plugins.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="using-plugins">
<title>Installing and Using Plugins</title>
<!-- jEdit buffer-local properties: -->
@@ -140,4 +141,4 @@
</section>
-</chapter>
\ No newline at end of file
+</chapter>
diff --git a/doc/users-guide/writing-modes.xml b/doc/users-guide/writing-modes.xml
index 71db5d941..387da5bf0 100644
--- a/doc/users-guide/writing-modes.xml
+++ b/doc/users-guide/writing-modes.xml
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
<chapter id="writing-modes">
<title>Mode Definition Syntax</title>
<!-- jEdit buffer-local properties: -->
diff --git a/doc/whatsnew/news.xml b/doc/whatsnew/news.xml
index 0a92779ee..aefe4a4c0 100644
--- a/doc/whatsnew/news.xml
+++ b/doc/whatsnew/news.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<article id="whatsnewarticle"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="https://www.docbook.org/xsd/4.4/docbook.xsd">
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd">
+<article id="whatsnewarticle">
<title> What's new in jEdit 5.7 </title>
<articleinfo>
commit: https://sourceforge.net/p/jedit/jEdit/ci/f90aa5ae8569de399c515332a1c9ba4fabfff230/
tree: https://sourceforge.net/p/jedit/jEdit/ci/f90aa5ae8569de399c515332a1c9ba4fabfff230/tree/
commit f90aa5ae8569de399c515332a1c9ba4fabfff230
Author: Björn Kautler <Bj...@Ka...>
Date: Tue Apr 8 02:57:22 2025 +0200
Correctly show "/" on *nix and properly add it to FSB history
diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index 2ebd773da..11368cb8d 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -84,6 +84,9 @@ for contributing to this release.
- Correct the result when using the reset button in the custom context menu
option pane for the file system browser (Björn Kautler)
+- Correctly show "/" on *nix and properly add it to file system browser history
+ (Björn Kautler)
+
}}}
{{{ Miscellaneous
diff --git a/org/gjt/sp/jedit/browser/VFSBrowser.java b/org/gjt/sp/jedit/browser/VFSBrowser.java
index 67fb69b92..d64bcc050 100644
--- a/org/gjt/sp/jedit/browser/VFSBrowser.java
+++ b/org/gjt/sp/jedit/browser/VFSBrowser.java
@@ -1352,8 +1352,8 @@ check_selected:
VFSBrowser.this.path = path;
if(!pathField.getText().equals(path))
pathField.setText(path);
- if(path.endsWith("/") ||
- path.endsWith(File.separator))
+ if((path.endsWith("/") || path.endsWith(File.separator))
+ && (path.length() > 1))
{
// ensure consistent history;
// eg we don't want both
commit: https://sourceforge.net/p/jedit/jEdit/ci/a6c2d768009a4900981da51203451d01d44cf33a/
tree: https://sourceforge.net/p/jedit/jEdit/ci/a6c2d768009a4900981da51203451d01d44cf33a/tree/
commit a6c2d768009a4900981da51203451d01d44cf33a
Author: Björn Kautler <Bj...@Ka...>
Date: Tue Apr 8 02:57:17 2025 +0200
Restore correct value in FSB custom context menu options
diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index 38c4960d5..2ebd773da 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -81,6 +81,9 @@ for contributing to this release.
- Restore lost search indexing error title and message (Björn Kautler)
+- Correct the result when using the reset button in the custom context menu
+ option pane for the file system browser (Björn Kautler)
+
}}}
{{{ Miscellaneous
@@ -134,6 +137,11 @@ for contributing to this release.
- Added MiscUtilities.isUncPath to determine whether a given path is a UNC path
(Björn Kautler)
+- The previous AbstractContextOptionPane constructors are now deprecated; the
+ reset button in that class always restored the view context menu for all
+ subclasses, in the new constructors the property key has to be specified
+ (Björn Kautler)
+
}}}
{{{ Editing
diff --git a/org/gjt/sp/jedit/gui/AbstractContextOptionPane.java b/org/gjt/sp/jedit/gui/AbstractContextOptionPane.java
index 27dfc42b5..fda046137 100644
--- a/org/gjt/sp/jedit/gui/AbstractContextOptionPane.java
+++ b/org/gjt/sp/jedit/gui/AbstractContextOptionPane.java
@@ -38,13 +38,10 @@ import org.gjt.sp.util.StandardUtilities;
*
* @author Slava Pestov
* @author Marcelo Vanzin
- * @version $Id$
* @since jEdit 4.3pre13
*/
public abstract class AbstractContextOptionPane extends AbstractOptionPane
{
- private final ActionContext actionContext;
-
/**
* Constructor that takes a name as an argument, for use by
* subclasses.
@@ -53,26 +50,62 @@ public abstract class AbstractContextOptionPane extends AbstractOptionPane
* @param caption String to use as the caption of the context menu
* configuration list.
* @since jEdit 4.3pre13
+ * @deprecated As of jEdit 5.8pre1, replaced by {@link #AbstractContextOptionPane(String, String, String)}
*/
+ @Deprecated
protected AbstractContextOptionPane(String name, String caption)
{
- this(name, caption, jEdit.getActionContext());
+ this(name, caption, "view.context", jEdit.getActionContext());
}
/**
* Constructor that takes a name as an argument, for use by
* subclasses.
*
- * @param name Name of the option pane.
- * @param caption String to use as the caption of the context menu
- * configuration list.
- * @param actionContext the actionContext
+ * @param name Name of the option pane.
+ * @param caption String to use as the caption of the context menu
+ * configuration list.
+ * @param contextMenuKey Property key for the context menu configuration
+ * @since jEdit 5.8pre1
+ */
+ protected AbstractContextOptionPane(String name, String caption, String contextMenuKey)
+ {
+ this(name, caption, contextMenuKey, jEdit.getActionContext());
+ }
+
+ /**
+ * Constructor that takes a name as an argument, for use by
+ * subclasses.
+ *
+ * @param name Name of the option pane.
+ * @param caption String to use as the caption of the context menu
+ * configuration list.
+ * @param actionContext The actionContext
* @since jEdit 4.5pre1
+ * @deprecated As of jEdit 5.8pre1, replaced by {@link #AbstractContextOptionPane(String, String, String, ActionContext)}
*/
+ @Deprecated
protected AbstractContextOptionPane(String name, String caption, ActionContext actionContext)
+ {
+ this(name, caption, "view.context", actionContext);
+ }
+
+ /**
+ * Constructor that takes a name as an argument, for use by
+ * subclasses.
+ *
+ * @param name Name of the option pane.
+ * @param caption String to use as the caption of the context menu
+ * configuration list.
+ * @param contextMenuKey Property key for the context menu configuration
+ * @param actionContext The actionContext
+ * @since jEdit 5.8pre1
+ */
+ protected AbstractContextOptionPane(String name, String caption, String contextMenuKey, ActionContext actionContext)
{
super(name);
this.actionContext = actionContext;
+ this.contextMenuKey = contextMenuKey;
this.caption = new JLabel(caption);
}
@@ -137,14 +170,25 @@ public abstract class AbstractContextOptionPane extends AbstractOptionPane
*
* @since jEdit 4.3pre13
*/
- protected abstract String getContextMenu();
+ /**
+ * Returns jEdit's context menu configuration.
+ *
+ * @since jEdit 4.3pre13
+ */
+ protected String getContextMenu()
+ {
+ return jEdit.getProperty(contextMenuKey);
+ }
/**
* Saves the context menu configuration.
*
* @since jEdit 4.3pre13
*/
- protected abstract void saveContextMenu(String menu);
+ protected void saveContextMenu(String menu)
+ {
+ jEdit.setProperty(contextMenuKey, menu);
+ }
/**
* Adds a widget to the "buttons" panel at the bottom. The component
@@ -187,6 +231,8 @@ public abstract class AbstractContextOptionPane extends AbstractOptionPane
private JButton remove;
private JButton moveUp, moveDown;
private JButton reset;
+ private final ActionContext actionContext;
+ private final String contextMenuKey;
private final JLabel caption;
private JPanel buttons;
@@ -314,10 +360,10 @@ public abstract class AbstractContextOptionPane extends AbstractOptionPane
// so we need to modify the list, not the actual property
// since the default value is not available,
// we reset, fetch default value and re-set to original
- String orgContext = jEdit.getProperty("view.context");
- jEdit.resetProperty("view.context");
- String defaultContext = jEdit.getProperty("view.context");
- jEdit.setProperty("view.context", orgContext);
+ String orgContext = jEdit.getProperty(contextMenuKey);
+ jEdit.resetProperty(contextMenuKey);
+ String defaultContext = jEdit.getProperty(contextMenuKey);
+ jEdit.setProperty(contextMenuKey, orgContext);
reloadContextList(defaultContext);
// reset selection if user had more buttons than default
diff --git a/org/gjt/sp/jedit/options/BrowserContextOptionPane.java b/org/gjt/sp/jedit/options/BrowserContextOptionPane.java
index fb08050d1..3a0e95ba6 100644
--- a/org/gjt/sp/jedit/options/BrowserContextOptionPane.java
+++ b/org/gjt/sp/jedit/options/BrowserContextOptionPane.java
@@ -28,36 +28,11 @@ import org.gjt.sp.jedit.jEdit;
* Right-click context menu editor.
*
* @author Matthieu Casanova
- * @version $Id$
*/
public class BrowserContextOptionPane extends AbstractContextOptionPane
{
-
public BrowserContextOptionPane()
{
- super("browser.custom.context", jEdit.getProperty("options.browser.context.caption"));
- }
-
- /**
- * Returns jEdit's context menu configuration.
- *
- * @since jEdit 4.3pre13
- */
- @Override
- protected String getContextMenu()
- {
- return jEdit.getProperty("browser.custom.context");
+ super("browser.custom.context", jEdit.getProperty("options.browser.custom.context.caption"), "browser.custom.context");
}
-
- /**
- * Saves jEdit's context menu configuration.
- *
- * @since jEdit 4.3pre13
- */
- @Override
- protected void saveContextMenu(String menu)
- {
- jEdit.setProperty("browser.custom.context", menu);
- }
-
}
diff --git a/org/gjt/sp/jedit/options/ContextOptionPane.java b/org/gjt/sp/jedit/options/ContextOptionPane.java
index 0dcf3faa1..547d3debf 100644
--- a/org/gjt/sp/jedit/options/ContextOptionPane.java
+++ b/org/gjt/sp/jedit/options/ContextOptionPane.java
@@ -39,7 +39,7 @@ public class ContextOptionPane extends AbstractContextOptionPane
public ContextOptionPane()
{
- super("context", jEdit.getProperty("options.context.caption"));
+ super("context", jEdit.getProperty("options.context.caption"), "view.context");
}
@Override
@@ -53,17 +53,6 @@ public class ContextOptionPane extends AbstractContextOptionPane
addButton(includeOptionsLink);
}
- /**
- * Returns jEdit's context menu configuration.
- *
- * @since jEdit 4.3pre13
- */
- @Override
- protected String getContextMenu()
- {
- return jEdit.getProperty("view.context");
- }
-
/**
* Saves jEdit's context menu configuration.
*
@@ -72,7 +61,7 @@ public class ContextOptionPane extends AbstractContextOptionPane
@Override
protected void saveContextMenu(String menu)
{
- jEdit.setProperty("view.context", menu);
+ super.saveContextMenu(menu);
jEdit.setBooleanProperty(
"options.context.includeOptionsLink",
includeOptionsLink.isSelected());
commit: https://sourceforge.net/p/jedit/jEdit/ci/74944041504cb27c50b4a20a43197e9d5020f25a/
tree: https://sourceforge.net/p/jedit/jEdit/ci/74944041504cb27c50b4a20a43197e9d5020f25a/tree/
commit 74944041504cb27c50b4a20a43197e9d5020f25a
Author: Björn Kautler <Bj...@Ka...>
Date: Tue Apr 8 02:57:12 2025 +0200
Restore lost search indexing error title and message
diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index a0519772e..38c4960d5 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -79,6 +79,8 @@ for contributing to this release.
- Do not consider a directory with dot to have an extension in file system
browser, for example when sorting by type (Björn Kautler)
+- Restore lost search indexing error title and message (Björn Kautler)
+
}}}
{{{ Miscellaneous
diff --git a/org/jedit/localization/jedit_de.props b/org/jedit/localization/jedit_de.props
index 8a56b9fc3..64058d8ae 100644
--- a/org/jedit/localization/jedit_de.props
+++ b/org/jedit/localization/jedit_de.props
@@ -2031,6 +2031,9 @@ helpviewer.toc.online-apidocs=jEdit API-Referenz (Online)
helpviewer.search.label=Suche
helpviewer.search.caption=Suchen nach:
+helpviewer.search.error.title=Indizierungsfehler
+helpviewer.search.error.message=Während des aufbauen des Hilfeindexes ist ein Fehler aufgetreten.\n\
+ ({0})
helpviewer.searching=Suchen...
helpviewer.no-results=Keine Ergebnisse
#}}}
diff --git a/org/jedit/localization/jedit_en.props b/org/jedit/localization/jedit_en.props
index ec360ba9e..98d750675 100644
--- a/org/jedit/localization/jedit_en.props
+++ b/org/jedit/localization/jedit_en.props
@@ -2011,6 +2011,9 @@ helpviewer.toc.online-apidocs=jEdit API Reference (Online)
helpviewer.search.label=Search
helpviewer.search.caption=Search for:
+helpviewer.search.error.title=Indexing Error
+helpviewer.search.error.message=An error occurred while building the help index.\n\
+ ({0})
helpviewer.searching=Searching...
helpviewer.no-results=No results
#}}}
commit: https://sourceforge.net/p/jedit/jEdit/ci/ae921958a37a449784927572d36fcdfb5707fc13/
tree: https://sourceforge.net/p/jedit/jEdit/ci/ae921958a37a449784927572d36fcdfb5707fc13/tree/
commit ae921958a37a449784927572d36fcdfb5707fc13
Author: Björn Kautler <Bj...@Ka...>
Date: Tue Apr 8 02:57:07 2025 +0200
Allow to configure additional UNC server under roots VFS
diff --git a/doc/CHANGES.txt b/doc/CHANGES.txt
index 67f98c632..a0519772e 100644
--- a/doc/CHANGES.txt
+++ b/doc/CHANGES.txt
@@ -105,6 +105,9 @@ for contributing to this release.
- Show local WSL network share under roots: file system (Björn Kautler)
+- Allow to configure additional UNC server to be shown under the roots: file
+ system in the file system browser on Windows (Björn Kautler)
+
}}}
{{{ API Changes
diff --git a/org/gjt/sp/jedit/io/FileRootsVFS.java b/org/gjt/sp/jedit/io/FileRootsVFS.java
index fbff5ab1c..1bda24cd2 100644
--- a/org/gjt/sp/jedit/io/FileRootsVFS.java
+++ b/org/gjt/sp/jedit/io/FileRootsVFS.java
@@ -34,9 +34,11 @@ import java.util.Arrays;
import java.util.HashSet;
import java.util.LinkedList;
import java.util.Set;
+import java.util.StringTokenizer;
import org.gjt.sp.jedit.MiscUtilities;
import org.gjt.sp.jedit.OperatingSystem;
+import org.gjt.sp.jedit.jEdit;
import static org.gjt.sp.jedit.MiscUtilities.isUncPath;
//}}}
@@ -132,7 +134,13 @@ public class FileRootsVFS extends VFS
rootsPlus.addAll(Arrays.asList(roots));
rootsPlus.addAll(Arrays.asList(fsViewRoots));
if(OperatingSystem.isWindows()) {
- rootsPlus.add(new File("\\\\wsl$"));
+ String uncRoots = jEdit.getProperty("vfs.browser.additionalUncRoots", "\\\\wsl$");
+ StringTokenizer st = new StringTokenizer(uncRoots);
+ while(st.hasMoreTokens())
+ {
+ String uncRoot = st.nextToken();
+ rootsPlus.add(new File(uncRoot));
+ }
}
return rootsPlus.toArray(new File[0]);
}
diff --git a/org/gjt/sp/jedit/io/FileVFS.java b/org/gjt/sp/jedit/io/FileVFS.java
index 54f1a456e..6af3972be 100644
--- a/org/gjt/sp/jedit/io/FileVFS.java
+++ b/org/gjt/sp/jedit/io/FileVFS.java
@@ -38,8 +38,13 @@ import java.lang.reflect.Method;
import java.nio.file.Files;
import java.text.*;
import java.util.Date;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.concurrent.CopyOnWriteArrayList;
import org.gjt.sp.jedit.*;
+import org.gjt.sp.jedit.EditBus.EBHandler;
+import org.gjt.sp.jedit.msg.PropertiesChanged;
import org.gjt.sp.util.IOUtilities;
import org.gjt.sp.util.Log;
@@ -66,8 +71,30 @@ public class FileVFS extends VFS
? CASE_INSENSITIVE_CAP : 0),
new String[] { EA_SIZE, EA_MODIFIED, EA_STATUS,
EA_TYPE });
+
+ if(OperatingSystem.isWindows()) {
+ EditBus.addToBus(this);
+ updateAdditionalUncServers(null);
+ }
} //}}}
+ @EBHandler
+ public void updateAdditionalUncServers(PropertiesChanged propertiesChanged)
+ {
+ additionalUncServers.clear();
+ String uncRoots = jEdit.getProperty("vfs.browser.additionalUncRoots", "\\\\wsl$");
+ StringTokenizer st = new StringTokenizer(uncRoots);
+ while(st.hasMoreTokens())
+ {
+ String uncServer = st.nextToken().substring(2);
+ additionalUncServers.add(uncServer);
+ if ("wsl$".equals(uncServer))
+ additionalUncServers.add("wsl.localhost");
+ if ("wsl.localhost".equals(uncServer))
+ additionalUncServers.add("wsl$");
+ }
+ }
+
//{{{ getFileName() method
@Override
public String getFileName(String path)
@@ -96,13 +123,14 @@ public class FileVFS extends VFS
return FileRootsVFS.PROTOCOL + ':';
else if (isUncPath(path)
&& (MiscUtilities.getLastSeparatorIndex(path, true) == 1))
- if ((path.length() >= 5)
- && (path.charAt(2) == 'w')
- && (path.charAt(3) == 's')
- && (path.charAt(4) == 'l'))
+ {
+ int firstSeparatorIndex = MiscUtilities.getFirstSeparatorIndex(path.substring(2));
+ if ((path.length() >= 3)
+ && additionalUncServers.contains(path.substring(2, firstSeparatorIndex == -1 ? path.length() : firstSeparatorIndex + 2)))
return FileRootsVFS.PROTOCOL + ':';
else
return path;
+ }
}
return super.getParentOfPath(path);
@@ -718,5 +746,6 @@ public class FileVFS extends VFS
//{{{ Private members
private static FileSystemView fsView;
+ private static final List<String> additionalUncServers = new CopyOnWriteArrayList<>();
//}}}
}
diff --git a/org/gjt/sp/jedit/jedit.props b/org/gjt/sp/jedit/jedit.props
index 2b5a32947..eeecdbd07 100644
--- a/org/gjt/sp/jedit/jedit.props
+++ b/org/gjt/sp/jedit/jedit.props
@@ -494,6 +494,8 @@ vfs.browser.colors.8.glob=*.{props,properties}
vfs.browser.colors.8.color=#666666
browser.custom.context=
+
+vfs.browser.additionalUncRoots=\\\\wsl$
#}}}
#{{{ Plugin manager settings
diff --git a/org/gjt/sp/jedit/jedit_gui.props b/org/gjt/sp/jedit/jedit_gui.props
index 878c8b6b8..2a37bb3a2 100644
--- a/org/gjt/sp/jedit/jedit_gui.props
+++ b/org/gjt/sp/jedit/jedit_gui.props
@@ -800,7 +800,7 @@ options.groups=jedit browser
options.group.jedit=general abbrevs appearance context docking editing \
encodings gutter large-files mouse plugin-manager firewall save-back \
shortcuts status syntax textarea toolbar view
-options.group.browser=browser.general browser.colors browser.custom.context
+options.group.browser=browser.general browser.colors browser.custom.context browser.additional-unc-roots
#}}}
#{{{ General pane
@@ -929,13 +929,10 @@ view.fracFontMetrics=false
#}}}
#{{{ File System Browser panes
-options.browser.colors.code=new BrowserColorsOptionPane();
-
options.browser.general.code=new BrowserOptionPane();
-#}}}
-
-#{{{ Browser Context Menu
+options.browser.colors.code=new BrowserColorsOptionPane();
options.browser.custom.context.code=new BrowserContextOptionPane();
+options.browser.additional-unc-roots.code=new BrowserAdditionalUncRootsOptionPane()
#}}}
#}}}
diff --git a/org/gjt/sp/jedit/options/BrowserAdditionalUncRootsOptionPane.java b/org/gjt/sp/jedit/options/BrowserAdditionalUncRootsOptionPane.java
new file mode 100644
index 000000000..a7945391b
--- /dev/null
+++ b/org/gjt/sp/jedit/options/BrowserAdditionalUncRootsOptionPane.java
@@ -0,0 +1,257 @@
+/*
+ * Copyright (C) 2000, 2001 Slava Pestov
+ * :tabSize=4:indentSize=4:noTabs=false:
+ * :folding=explicit:collapseFolds=1:
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+package org.gjt.sp.jedit.options;
+
+//{{{ Imports
+import java.awt.BorderLayout;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
+import java.util.StringTokenizer;
+import javax.swing.AbstractListModel;
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.border.EmptyBorder;
+
+import org.gjt.sp.jedit.AbstractOptionPane;
+import org.gjt.sp.jedit.GUIUtilities;
+import org.gjt.sp.jedit.gui.RolloverButton;
+import org.gjt.sp.jedit.jEdit;
+
+import static java.awt.BorderLayout.CENTER;
+import static java.awt.BorderLayout.NORTH;
+import static javax.swing.Box.createGlue;
+import static javax.swing.Box.createHorizontalStrut;
+import static javax.swing.BoxLayout.X_AXIS;
+import static javax.swing.ListSelectionModel.SINGLE_SELECTION;
+import static org.gjt.sp.jedit.GUIUtilities.error;
+import static org.gjt.sp.jedit.GUIUtilities.loadIcon;
+import static org.gjt.sp.jedit.MiscUtilities.getLastSeparatorIndex;
+import static org.gjt.sp.jedit.MiscUtilities.isUncPath;
+// }}}
+
+/**
+ * Additional UNC roots editor.
+ *
+ * @author Björn Kautler
+ * @since jEdit 5.8pre1
+ */
+public class BrowserAdditionalUncRootsOptionPane extends AbstractOptionPane
+{
+ //{{{ BrowserAdditionalUncRootsOptionPane constructor
+ public BrowserAdditionalUncRootsOptionPane()
+ {
+ super("browser.additional-unc-roots");
+ caption = new JLabel(jEdit.getProperty("options.browser.additional-unc-roots.caption"));
+ } // }}}
+
+ //{{{ _init method
+ @Override
+ protected void _init()
+ {
+ setLayout(new BorderLayout());
+
+ add(NORTH, caption);
+
+ listData = new ArrayList<>();
+ listModel = new SortedListModel();
+ reloadUncRootsList(jEdit.getProperty("vfs.browser.additionalUncRoots"));
+
+ list = new JList<>(listModel);
+ list.setSelectionMode(SINGLE_SELECTION);
+ list.addListSelectionListener(__ -> updateButtons());
+
+ add(CENTER, new JScrollPane(list));
+
+ JPanel buttons = new JPanel();
+ buttons.setBorder(new EmptyBorder(3, 0, 0, 0));
+ buttons.setLayout(new BoxLayout(buttons, X_AXIS));
+ ActionHandler actionHandler = new ActionHandler();
+ add = new RolloverButton(loadIcon(jEdit.getProperty("common.add.icon")));
+ add.setToolTipText(jEdit.getProperty("common.add"));
+ add.addActionListener(actionHandler);
+ buttons.add(add);
+ buttons.add(createHorizontalStrut(6));
+ remove = new RolloverButton(loadIcon(jEdit.getProperty("common.remove.icon")));
+ remove.setToolTipText(jEdit.getProperty("common.remove"));
+ remove.addActionListener(actionHandler);
+ buttons.add(remove);
+ buttons.add(createGlue());
+
+ // add "reset to defaults" button
+ reset = new RolloverButton(loadIcon(jEdit.getProperty("common.clearAll.icon")));
+ reset.setToolTipText(jEdit.getProperty("common.reset"));
+ reset.addActionListener(actionHandler);
+ buttons.add(reset);
+
+ updateButtons();
+ add(BorderLayout.SOUTH, buttons);
+ } // }}}
+
+ //{{{ _save method
+ @Override
+ protected void _save()
+ {
+ StringJoiner joiner = new StringJoiner(" ");
+ for(String uncRoot : listData)
+ joiner.add(uncRoot);
+ jEdit.setProperty("vfs.browser.additionalUncRoots", joiner.toString());
+ } // }}}
+
+ //{{{ Private members
+ private List<String> listData;
+ private SortedListModel listModel;
+ private JList<String> list;
+ private JButton add;
+ private JButton remove;
+ private JButton reset;
+ private final JLabel caption;
+ // }}}
+
+ //{{{ updateButtons method
+ private void updateButtons()
+ {
+ int index = list.getSelectedIndex();
+ remove.setEnabled((index != -1) && !listData.isEmpty());
+ } // }}}
+
+ //{{{ reloadUncRootsList method
+ private void reloadUncRootsList(String uncRoots)
+ {
+ listData.clear();
+ StringTokenizer st = new StringTokenizer(uncRoots);
+ while(st.hasMoreTokens())
+ {
+ String uncRoot = st.nextToken();
+ if(!listData.contains(uncRoot))
+ listData.add(uncRoot);
+ }
+ Collections.sort(listData);
+ listModel.fireContentsChanged(listModel, 0, listData.size() - 1);
+ } // }}}
+
+ //{{{ SortedListModel class
+ private class SortedListModel extends AbstractListModel<String>
+ {
+ @Override
+ public int getSize()
+ {
+ return listData.size();
+ }
+
+ @Override
+ public String getElementAt(int index)
+ {
+ return listData.get(index);
+ }
+
+ @Override
+ protected void fireContentsChanged(Object source, int index0, int index1)
+ {
+ super.fireContentsChanged(source, index0, index1);
+ }
+ } // }}}
+
+ //{{{ ActionHandler class
+ private class ActionHandler implements ActionListener
+ {
+ @Override
+ public void actionPerformed(ActionEvent evt)
+ {
+ Object source = evt.getSource();
+
+ if(source == add)
+ {
+ String userInput = GUIUtilities.input(BrowserAdditionalUncRootsOptionPane.this, "options.browser.additional-unc-roots.add.dialog", null);
+ while(userInput != null)
+ {
+ int lastSeparatorIndex = getLastSeparatorIndex(userInput);
+ if(((isUncPath(userInput) && (lastSeparatorIndex == 1))
+ || (!userInput.isBlank() && (lastSeparatorIndex == -1)))
+ && (!userInput.contains(" ")))
+ {
+ String uncRoot = "\\\\" + userInput.substring(lastSeparatorIndex + 1);
+ if(!listData.contains(uncRoot))
+ {
+ String selectedValue = list.getSelectedValue();
+ listData.add(uncRoot);
+ Collections.sort(listData);
+ listModel.fireContentsChanged(listModel, 0, listData.size() - 1);
+ list.setSelectedValue(selectedValue, true);
+ }
+ break;
+ }
+ else
+ {
+ error(BrowserAdditionalUncRootsOptionPane.this, "options.browser.additional-unc-roots.format.error", null);
+ userInput = GUIUtilities.input(BrowserAdditionalUncRootsOptionPane.this, "options.browser.additional-unc-roots.add.dialog", userInput);
+ }
+ }
+ }
+ else if(source == remove)
+ {
+ int index = list.getSelectedIndex();
+ listData.remove(index);
+ listModel.fireContentsChanged(listModel, 0, listData.size() - 1);
+ if(!listData.isEmpty())
+ {
+ list.setSelectedIndex(
+ Math.min(listData.size() - 1,
+ index));
+ }
+ updateButtons();
+ }
+ else if(source == reset)
+ {
+ String dialogType = "options.browser.additional-unc-roots.reset.dialog";
+ int result = GUIUtilities.confirm(list, dialogType, null,
+ JOptionPane.YES_NO_OPTION,
+ JOptionPane.WARNING_MESSAGE);
+
+ if(result == JOptionPane.YES_OPTION)
+ {
+ // the user should be able to cancel the options dialog
+ // so we need to modify the list, not the actual property
+ // since the default value is not available,
+ // we reset, fetch default value and re-set to original
+ String orgUncRoots = jEdit.getProperty("vfs.browser.additionalUncRoots");
+ jEdit.resetProperty("vfs.browser.additionalUncRoots");
+ String defaultUncRoots = jEdit.getProperty("vfs.browser.additionalUncRoots");
+ jEdit.setProperty("vfs.browser.additionalUncRoots", orgUncRoots);
+ reloadUncRootsList(defaultUncRoots);
+
+ // reset selection if user had more buttons than default
+ list.setSelectedIndex(0);
+ list.ensureIndexIsVisible(0);
+ updateButtons();
+ }
+ }
+ }
+ } // }}}
+}
diff --git a/org/jedit/localization/jedit_de.props b/org/jedit/localization/jedit_de.props
index dd080b374..8a56b9fc3 100644
--- a/org/jedit/localization/jedit_de.props
+++ b/org/jedit/localization/jedit_de.props
@@ -1956,6 +1956,20 @@ options.browser.general.currentBufferFilter=Filter in Dateidialogen ist der Typ
options.browser.general.useDefaultIcons=Standard-Icons verwenden
#}}}
+#{{{ Browser Additional UNC Roots
+options.browser.additional-unc-roots.label=Zusätzliche UNC Server
+options.browser.additional-unc-roots.caption=Zusätzliche UNC Server die im roots: Dateisystem angezeigt werden:
+
+options.browser.additional-unc-roots.add.dialog.title=Neuer UNC Server
+options.browser.additional-unc-roots.add.dialog.message=Welcher zusätzliche UNC Server soll angezeigt werden?
+
+options.browser.additional-unc-roots.format.error.title=Kein UNC Server
+options.browser.additional-unc-roots.format.error.message=Der eingegebene Text ist kein valider UNC Server, Beispiele sind "fileserver.company.com" oder "\\\\shares"
+
+options.browser.additional-unc-roots.reset.dialog.title=Zurücksetzen
+options.browser.additional-unc-roots.reset.dialog.message=Sollen die zusätzlichen UNC Server wirklich auf die Standardeinträge zurückgesetzt werden?
+#}}}
+
#{{{ Browser Context Menu
options.browser.custom.context.label=Kontextmenü
options.browser.custom.context.caption=Eigene Einträge im Kontextmenü des Dateisystem-Browsers:
diff --git a/org/jedit/localization/jedit_en.props b/org/jedit/localization/jedit_en.props
index c851752f4..ec360ba9e 100644
--- a/org/jedit/localization/jedit_en.props
+++ b/org/jedit/localization/jedit_en.props
@@ -1936,6 +1936,20 @@ options.browser.general.currentBufferFilter=Filter in file dialogs is \
options.browser.general.useDefaultIcons=Use default icons
#}}}
+#{{{ Browser Additional UNC Roots
+options.browser.additional-unc-roots.label=Additional UNC Roots
+options.browser.additional-unc-roots.caption=Additional UNC servers that are shown under the roots: file system:
+
+options.browser.additional-unc-roots.add.dialog.title=New UNC Server
+options.browser.additional-unc-roots.add.dialog.message=Which additional UNC server should be shown?
+
+options.browser.additional-unc-roots.format.error.title=Not a UNC Server
+options.browser.additional-unc-roots.format.error.message=The given input is not a valid UNC server, examples are "fileserver.company.com" or "\\\\shares"
+
+options.browser.additional-unc-roots.reset.dialog.title=Reset to Default
+options.browser.additional-unc-roots.reset.dialog.message=Are you sure you want to reset the additional UNC roots to the installation default?
+#}}}
+
#{{{ Browser Context Menu
options.browser.custom.context.label=Context menu
options.browser.custom.context.caption=Custom items in browser right click menu:
diff --git a/org/jedit/options/GlobalOptionGroup.java b/org/jedit/options/GlobalOptionGroup.java
index eef66ed63..a7afec456 100644
--- a/org/jedit/options/GlobalOptionGroup.java
+++ b/org/jedit/options/GlobalOptionGroup.java
@@ -24,6 +24,7 @@
package org.jedit.options;
+import org.gjt.sp.jedit.OperatingSystem;
import org.gjt.sp.jedit.OptionGroup;
import org.gjt.sp.jedit.jEdit;
@@ -65,13 +66,14 @@ public class GlobalOptionGroup extends OptionGroup
}
else if ("browser".equals(group))
{
- def = "browser.general browser.colors browser.custom.context";
+ def = "browser.general browser.colors browser.custom.context browser.additional-unc-roots";
}
String optionPanes = jEdit.getProperty(paneList, def);
String[] panes = optionPanes.split(" ");
for (String pane : panes)
{
- optionGroup.addOptionPane(pane);
+ if (OperatingSystem.isWindows() || !"browser.additional-unc-roots".equals(pane))
+ optionGroup.addOptionPane(pane);
}
addGroup(optionGroup);
}
commit: https://sourceforge.net/p/jedit/jEdit/ci/c97ae42442d3a3d029eef2f2484ddc65e07228a0/
tree: https://sourceforge.net/p/jedit/jEdit/ci/c97ae42442d3a3d029eef2f2484ddc65e07228a0/tree/
commit c97ae42442d3a3d029eef2f2484ddc65e07228a0
Author: Björn Kautler <Bj...@Ka...>
Date: Tue Apr 8 02:57:01 2025 +0200
Correct fallback option group contents
diff --git a/org/jedit/options/GlobalOptionGroup.java b/org/jedit/options/GlobalOptionGroup.java
index 6069ea913..eef66ed63 100644
--- a/org...
[truncated message content] |
