From: <ez...@us...> - 2011-10-18 20:56:34
|
Revision: 20118 http://jedit.svn.sourceforge.net/jedit/?rev=20118&view=rev Author: ezust Date: 2011-10-18 20:56:28 +0000 (Tue, 18 Oct 2011) Log Message: ----------- merge doc update. Modified Paths: -------------- jEdit/branches/4.5.x/doc/users-guide/files.xml Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117 Modified: jEdit/branches/4.5.x/doc/users-guide/files.xml =================================================================== --- jEdit/branches/4.5.x/doc/users-guide/files.xml 2011-10-18 20:53:36 UTC (rev 20117) +++ jEdit/branches/4.5.x/doc/users-guide/files.xml 2011-10-18 20:56:28 UTC (rev 20118) @@ -623,10 +623,10 @@ operations.</para> <para>The - <guimenu>Utilities</guimenu>><guisubmenu>Troubleshooting</guisubmenu>><guimenuitem>I/O - Progress Monitor</guimenuitem> command displays a window with more + <guimenu>Utilities</guimenu>><guisubmenu>Troubleshooting</guisubmenu>> + <guimenuitem>Task Monitor</guimenuitem> command displays a window with more detailed status information and progress meters. By default, the - <guimenuitem>I/O Progress Monitor</guimenuitem> is shown in a floating + <guimenuitem>Task Monitor</guimenuitem> is shown in a floating window. This window can be docked using the commands in its top-left corner popup menu; see <xref linkend="docking" />. I/O requests can also be aborted in this window, however note that aborting a buffer save can This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-10-19 17:54:53
|
Revision: 20133 http://jedit.svn.sourceforge.net/jedit/?rev=20133&view=rev Author: ezust Date: 2011-10-19 17:54:42 +0000 (Wed, 19 Oct 2011) Log Message: ----------- Merging FAQ updates. Modified Paths: -------------- jEdit/branches/4.5.x/doc/FAQ/faq-general.xml jEdit/branches/4.5.x/doc/FAQ/faq-use.xml Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132 Modified: jEdit/branches/4.5.x/doc/FAQ/faq-general.xml =================================================================== --- jEdit/branches/4.5.x/doc/FAQ/faq-general.xml 2011-10-19 17:52:43 UTC (rev 20132) +++ jEdit/branches/4.5.x/doc/FAQ/faq-general.xml 2011-10-19 17:54:42 UTC (rev 20133) @@ -624,16 +624,6 @@ web site</ulink>.</para> </answer> </qandaentry> - <qandaentry> - <question id="jedit-compile"> - <para>How do you set the classpath and compile the Java - files in jEdit?</para> - </question> - <answer> - <para>The classpath can be set from ProjectViewer's project properties on a per-project basis. The ClassPath plugin provides this option pane to ProjectViewer. JavaSideKick uses it for completion, and other Java plugins should also. At the time of writing, the JCompiler plugin needs to be updated to use it, for example. - </para> - </answer> - </qandaentry> </qandadiv> </qandaset> </section> Modified: jEdit/branches/4.5.x/doc/FAQ/faq-use.xml =================================================================== --- jEdit/branches/4.5.x/doc/FAQ/faq-use.xml 2011-10-19 17:52:43 UTC (rev 20132) +++ jEdit/branches/4.5.x/doc/FAQ/faq-use.xml 2011-10-19 17:54:42 UTC (rev 20133) @@ -456,6 +456,20 @@ <qandadiv id="source-compile"> <title>Compiling source code</title> + <qandaentry> + <question id="jedit-compile"> + <para>How do you set the classpath for compiling Java files in jEdit?</para> + </question> + <answer> + <para>The classpath can be set from ProjectViewer's project properties + on a per-project basis. The ClassPath plugin provides this option pane + to ProjectViewer. JavaSideKick uses it for completion, and other Java + plugins should also. At the time of writing, the JCompiler plugin needs + to be updated to use it, for example. + </para> + </answer> + </qandaentry> + <qandaentry> <question id="compile-java"> <para>How do I compile my Java source in JEdit?</para> @@ -465,18 +479,16 @@ <para>There are a number of plugins that you can use to compile Java source code. You can run a Java compiler on the command line in the <quote>System</quote> shell of the - <application>Console</application> plugin. If you are using - the JCompiler plugin, you will have a - <quote>JCompiler</quote> shell in the - <application>Console</application> plugin, and you can run - the <userinput>compile</userinput> command for the current - file, or the <userinput>compilepkg</userinput> command on - all of the current directory's source code files. You can - also use the <quote>Ant</quote> commandos from the - <application>Console</application> plugin or the - <application>AntFarm</application> plugin to run complex - builds on a project of source code files, using a - <filename>build.xml</filename> file to specify build + <application>Console</application> plugin. When JCompiler is updated, + you can use that again. Many Java projects + can be built with Apache Ant, and that is how we build jEdit. + You can use the <quote>Ant</quote> commandos from the + <application>Console</application> plugin to run ant from jEdit, + and parse the error messages for ErrorList. Also, the + <application>Antelope</application> or + <application>AntFarm</application> plugins provide a more + Eclipse-like GUI front-end for Apache Ant. + Apache Ant uses a <filename>build.xml</filename> file to specify build commands and dependencies.</para> </answer> </qandaentry> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-11-08 00:27:12
|
Revision: 20251 http://jedit.svn.sourceforge.net/jedit/?rev=20251&view=rev Author: ezust Date: 2011-11-08 00:27:06 +0000 (Tue, 08 Nov 2011) Log Message: ----------- Merging docs fixes. Modified Paths: -------------- jEdit/branches/4.5.x/doc/users-guide/customizing.xml Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250 Modified: jEdit/branches/4.5.x/doc/users-guide/customizing.xml =================================================================== --- jEdit/branches/4.5.x/doc/users-guide/customizing.xml 2011-11-08 00:25:21 UTC (rev 20250) +++ jEdit/branches/4.5.x/doc/users-guide/customizing.xml 2011-11-08 00:27:06 UTC (rev 20251) @@ -118,9 +118,9 @@ </row> <row><entry><varname>encoding</varname></entry> - <entry> The character encoding that should be used for this file. + <entry> The character encoding that should be used for this file. See <xref linkend="encodings"/>. </entry></row> - + <row> <entry><varname>folding</varname></entry> @@ -354,8 +354,9 @@ <listitem><para> <literal>buffer-local-property</literal>: detects same syntax described at <xref linkend="buffer-local" /> - for property name "encoding". - (The above "python" encoding detector also accepts this syntax.) + for property name "encoding". Note that unlike other buffer-local + properties, this one will not work unless it is at the top of the file. + The above "python" encoding detector also accepts this syntax. </para></listitem> </itemizedlist> Others can be defined in plugins as services and added to this This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-11-08 19:27:42
|
Revision: 20255 http://jedit.svn.sourceforge.net/jedit/?rev=20255&view=rev Author: ezust Date: 2011-11-08 19:27:35 +0000 (Tue, 08 Nov 2011) Log Message: ----------- Merging doc fix. Modified Paths: -------------- jEdit/branches/4.5.x/doc/users-guide/customizing.xml Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254 Modified: jEdit/branches/4.5.x/doc/users-guide/customizing.xml =================================================================== --- jEdit/branches/4.5.x/doc/users-guide/customizing.xml 2011-11-08 19:26:39 UTC (rev 20254) +++ jEdit/branches/4.5.x/doc/users-guide/customizing.xml 2011-11-08 19:27:35 UTC (rev 20255) @@ -356,7 +356,6 @@ detects same syntax described at <xref linkend="buffer-local" /> for property name "encoding". Note that unlike other buffer-local properties, this one will not work unless it is at the top of the file. - The above "python" encoding detector also accepts this syntax. </para></listitem> </itemizedlist> Others can be defined in plugins as services and added to this This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-11-08 21:47:19
|
Revision: 20263 http://jedit.svn.sourceforge.net/jedit/?rev=20263&view=rev Author: ezust Date: 2011-11-08 21:47:13 +0000 (Tue, 08 Nov 2011) Log Message: ----------- Restart no longer required for L&F changes. Modified Paths: -------------- jEdit/branches/4.5.x/doc/users-guide/customizing.xml jEdit/branches/4.5.x/org/gjt/sp/jedit/options/AppearanceOptionPane.java Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262 Modified: jEdit/branches/4.5.x/doc/users-guide/customizing.xml =================================================================== --- jEdit/branches/4.5.x/doc/users-guide/customizing.xml 2011-11-08 21:46:07 UTC (rev 20262) +++ jEdit/branches/4.5.x/doc/users-guide/customizing.xml 2011-11-08 21:47:13 UTC (rev 20263) @@ -261,9 +261,6 @@ retained in history text fields can also be set here; see <xref linkend="history" />.</para> - <para>Note that changes to certain settings such as the Swing look - and feel and the docking framework require a restart of jEdit to - take effect.</para> </section> Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/options/AppearanceOptionPane.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/options/AppearanceOptionPane.java 2011-11-08 21:46:07 UTC (rev 20262) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/options/AppearanceOptionPane.java 2011-11-08 21:47:13 UTC (rev 20263) @@ -54,7 +54,7 @@ protected void _init() { /* Look and feel */ - addComponent(new JLabel(jEdit.getProperty("options.appearance.lf.note"))); +// addComponent(new JLabel(jEdit.getProperty("options.appearance.lf.note"))); lfs = UIManager.getInstalledLookAndFeels(); String[] names = new String[lfs.length]; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-11-10 10:08:41
|
Revision: 20278 http://jedit.svn.sourceforge.net/jedit/?rev=20278&view=rev Author: ezust Date: 2011-11-10 10:08:35 +0000 (Thu, 10 Nov 2011) Log Message: ----------- Tooltip merge from trunk. Modified Paths: -------------- jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262,20277 Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props 2011-11-10 10:06:37 UTC (rev 20277) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props 2011-11-10 10:08:35 UTC (rev 20278) @@ -205,8 +205,8 @@ %reload-encoding \ - \ close-buffer \ + closeall-except-active \ global-close-buffer \ - closeall-except-active \ close-all \ - \ save \ @@ -241,7 +241,8 @@ bufferset-toggle-exclusive.tooltip=When a buffer is opened, close it in other non-intersecting buffersets. closeall-except-active.icon.small=16x16/actions/document-close.png global-close-buffer.icon.small=16x16/actions/document-close.png -close-all.label=Clos$e All +close-all.label=Clos$e All (global) +close-all.tooltip=Close all buffers in all Views close-all.icon.small=16x16/actions/document-close.png save.label=$Save save.icon.small=16x16/actions/document-save.png This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-11-13 03:48:27
|
Revision: 20324 http://jedit.svn.sourceforge.net/jedit/?rev=20324&view=rev Author: ezust Date: 2011-11-13 03:48:21 +0000 (Sun, 13 Nov 2011) Log Message: ----------- Merge request 3436892, call ivy only once. Modified Paths: -------------- jEdit/branches/4.5.x/build.xml Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262,20277 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262,20277,20296 Modified: jEdit/branches/4.5.x/build.xml =================================================================== --- jEdit/branches/4.5.x/build.xml 2011-11-13 02:36:33 UTC (rev 20323) +++ jEdit/branches/4.5.x/build.xml 2011-11-13 03:48:21 UTC (rev 20324) @@ -130,7 +130,8 @@ </target> <target name="init-ivy" - depends="init,download-ivy"> + depends="init,download-ivy" + unless="ivy.done"> <property name="ivy.retrieve.pattern" value="${lib.dir}/[conf]/[artifact](-[classifier]).[ext]"/> <taskdef resource="org/apache/ivy/ant/antlib.xml" @@ -142,7 +143,8 @@ <target name="retrieve" description="retrieve the dependencies" - depends="init,init-ivy"> + depends="init,init-ivy" + unless="ivy.done"> <ivy:retrieve sync="true"/> <ivy:retrieve pattern="${lib.dir}/ivy/[artifact]-[revision].[ext]" organisation="org.apache.ivy" @@ -150,6 +152,8 @@ revision="${config.ivy.version}" conf="default" inline="true"/> + <property name="ivy.done" + value="true"/> </target> <target name="setup" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-11-15 08:08:04
|
Revision: 20348 http://jedit.svn.sourceforge.net/jedit/?rev=20348&view=rev Author: ezust Date: 2011-11-15 08:07:58 +0000 (Tue, 15 Nov 2011) Log Message: ----------- added another tooltip. Modified Paths: -------------- jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props jEdit/branches/4.5.x/org/gjt/sp/jedit/options/BufferOptionPane.java jEdit/branches/4.5.x/org/gjt/sp/jedit/options/EditingOptionPane.java Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262,20277,20296 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262,20277,20296,20347 Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props 2011-11-15 08:06:16 UTC (rev 20347) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props 2011-11-15 08:07:58 UTC (rev 20348) @@ -1963,6 +1963,7 @@ options.editing.camelCasedWords=Separate "CamelCased" words options.editing.noTabs=Soft (emulated with spaces) tabs options.editing.elasticTabstops=Indent using elastic tabstops +options.editing.elasticTabstops.tooltip=(Experimental) - may cause instability in jEdit. options.editing.deepIndent=Deep indent #}}} Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/options/BufferOptionPane.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/options/BufferOptionPane.java 2011-11-15 08:06:16 UTC (rev 20347) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/options/BufferOptionPane.java 2011-11-15 08:07:58 UTC (rev 20348) @@ -211,6 +211,7 @@ //{{{ Elastic tabstops elasticTabstops = new JCheckBox(jEdit.getProperty( "options.editing.elasticTabstops")); + elasticTabstops.setToolTipText(jEdit.getProperty("options.editing.elasticTabstops.tooltip")); elasticTabstops.setSelected(buffer.getBooleanProperty("elasticTabstops")); addComponent(elasticTabstops); //}}} Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/options/EditingOptionPane.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/options/EditingOptionPane.java 2011-11-15 08:06:16 UTC (rev 20347) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/options/EditingOptionPane.java 2011-11-15 08:07:58 UTC (rev 20348) @@ -117,7 +117,8 @@ addComponent(elasticTabstops = new JCheckBox(jEdit.getProperty( "options.editing.elasticTabstops"))); - + elasticTabstops.setToolTipText(jEdit.getProperty("options.editing.elasticTabstops.tooltip")); + addComponent(deepIndent = new JCheckBox(jEdit.getProperty( "options.editing.deepIndent"))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-11-15 08:24:57
|
Revision: 20350 http://jedit.svn.sourceforge.net/jedit/?rev=20350&view=rev Author: ezust Date: 2011-11-15 08:24:51 +0000 (Tue, 15 Nov 2011) Log Message: ----------- Tooltip for never mark untitled buffers dirty. Modified Paths: -------------- jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props jEdit/branches/4.5.x/org/gjt/sp/jedit/options/SaveBackupOptionPane.java Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262,20277,20296,20347 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262,20277,20296,20347,20349 Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props 2011-11-15 08:23:50 UTC (rev 20349) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props 2011-11-15 08:24:51 UTC (rev 20350) @@ -2085,6 +2085,7 @@ options.save-back.confirmSaveAll="Save All Buffers" asks for confirmation options.save-back.autosaveUntitled=Autosave untitled buffers options.save-back.suppressNotSavedConfirmUntitled=Never mark Untitled buffers dirty. +options.save-back.suppressNotSavedConfirmUntitled.tooltip=Checking this means untitled buffers get lost out whenever a new one is created (it's a feature!) options.save-back.useMD5forDirtyCalculation=Never mark buffers dirty if contents are unchanged. options.save-back.useMD5forDirtyCalculation.tooltip=Compare with length and MD5 hash of buffer at load time, to decide if an edited buffer is still dirty. #}}} Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/options/SaveBackupOptionPane.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/options/SaveBackupOptionPane.java 2011-11-15 08:23:50 UTC (rev 20349) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/options/SaveBackupOptionPane.java 2011-11-15 08:24:51 UTC (rev 20350) @@ -77,6 +77,8 @@ suppressNotSavedConfirmUntitled = new JCheckBox(jEdit.getProperty( "options.save-back.suppressNotSavedConfirmUntitled")); + suppressNotSavedConfirmUntitled.setToolTipText(jEdit.getProperty( + "options.save-back.suppressNotSavedConfirmUntitled.tooltip")); suppressNotSavedConfirmUntitled.setSelected( jEdit.getBooleanProperty("suppressNotSavedConfirmUntitled")); addComponent(suppressNotSavedConfirmUntitled); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2011-11-19 19:28:02
|
Revision: 20377 http://jedit.svn.sourceforge.net/jedit/?rev=20377&view=rev Author: k_satoda Date: 2011-11-19 19:27:56 +0000 (Sat, 19 Nov 2011) Log Message: ----------- Added buffer-local-property to list of encoding detectors. (Reviewed and accepted SF.net merge request #3435266) Modified Paths: -------------- jEdit/branches/4.5.x/doc/users-guide/customizing.xml jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit.props Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262,20277,20296,20347,20349 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262,20264,20277,20296,20347,20349 Modified: jEdit/branches/4.5.x/doc/users-guide/customizing.xml =================================================================== --- jEdit/branches/4.5.x/doc/users-guide/customizing.xml 2011-11-19 19:18:17 UTC (rev 20376) +++ jEdit/branches/4.5.x/doc/users-guide/customizing.xml 2011-11-19 19:27:56 UTC (rev 20377) @@ -118,7 +118,8 @@ </row> <row><entry><varname>encoding</varname></entry> - <entry> The character encoding that should be used for this file. + <entry> The character encoding that should be used for this file + (only works if at the top of file). See <xref linkend="encodings"/>. </entry></row> <row> Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit.props =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit.props 2011-11-19 19:18:17 UTC (rev 20376) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit.props 2011-11-19 19:27:56 UTC (rev 20377) @@ -129,7 +129,7 @@ checkFileStatus=0 # Encoding detectors -encodingDetectors=BOM XML-PI html python +encodingDetectors=BOM XML-PI html python buffer-local-property #}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Vam...@us...> - 2011-11-20 01:02:40
|
Revision: 20381 http://jedit.svn.sourceforge.net/jedit/?rev=20381&view=rev Author: Vampire0 Date: 2011-11-20 01:02:34 +0000 (Sun, 20 Nov 2011) Log Message: ----------- Update the version number to 4.5pre2 Modified Paths: -------------- jEdit/branches/4.5.x/build.xml jEdit/branches/4.5.x/doc/CHANGES.txt jEdit/branches/4.5.x/org/gjt/sp/jedit/jEdit.java Modified: jEdit/branches/4.5.x/build.xml =================================================================== --- jEdit/branches/4.5.x/build.xml 2011-11-20 00:37:44 UTC (rev 20380) +++ jEdit/branches/4.5.x/build.xml 2011-11-20 01:02:34 UTC (rev 20381) @@ -16,9 +16,9 @@ <!-- jEdit Version --> <property name="jedit.version" - value="4.5pre1"/> + value="4.5pre2"/> <property name="jedit.build.number" - value="04.05.01.00"/> + value="04.05.02.00"/> <property name="jedit.version.final" value="false"/> Modified: jEdit/branches/4.5.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.5.x/doc/CHANGES.txt 2011-11-20 00:37:44 UTC (rev 20380) +++ jEdit/branches/4.5.x/doc/CHANGES.txt 2011-11-20 01:02:34 UTC (rev 20381) @@ -2,6 +2,29 @@ (changes since jEdit 4.4.2) :encoding=UTF-8: +{{{ Version 4.5pre2 + +Thanks to Björn "Vampire" Kautler for contributing to this release. + +{{{ Bug Fixes + + +}}} +{{{ Miscellaneous + + +}}} +{{{ API Changes + + +}}} +{{{ Editing + + +}}} + +}}} + {{{ Version 4.5pre1 Thanks to Björn "Vampire" Kautler, Matthieu Casanova, Alan Ezust, cy6erGn0m, Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/jEdit.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/jEdit.java 2011-11-20 00:37:44 UTC (rev 20380) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/jEdit.java 2011-11-20 01:02:34 UTC (rev 20381) @@ -90,7 +90,7 @@ public static String getBuild() { // (major).(minor).(<99 = preX, 99 = "final").(bug fix) - return "04.05.01.00"; + return "04.05.02.00"; } //}}} //{{{ main() method This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-11-22 19:45:54
|
Revision: 20408 http://jedit.svn.sourceforge.net/jedit/?rev=20408&view=rev Author: ezust Date: 2011-11-22 19:45:48 +0000 (Tue, 22 Nov 2011) Log Message: ----------- Merge request# 3433905 for bug# 3163058. middle mouse button paste. Modified Paths: -------------- jEdit/branches/4.5.x/doc/CHANGES.txt jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/Gutter.java Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20250,20254,20262,20264,20277,20296,20347,20349 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349 Modified: jEdit/branches/4.5.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.5.x/doc/CHANGES.txt 2011-11-21 23:16:57 UTC (rev 20407) +++ jEdit/branches/4.5.x/doc/CHANGES.txt 2011-11-22 19:45:48 UTC (rev 20408) @@ -4,10 +4,13 @@ {{{ Version 4.5pre2 -Thanks to Björn "Vampire" Kautler for contributing to this release. +Thanks to Shlomy Reinstein, Alan Ezust, and Björn "Vampire" Kautler for +contributing to this release. {{{ Bug Fixes +- Fixed #3163058: middle mouse button paste doesn't respect gutter selection. + (Shlomy Reinstein) }}} {{{ Miscellaneous @@ -509,4 +512,4 @@ }}} jEdit buffer local properties: -:folding=explicit:collapseFolds=2: +:folding=explicit:collapseFolds=2:maxLineLen=80:wrap=hard:tabsize=4: Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/Gutter.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/Gutter.java 2011-11-21 23:16:57 UTC (rev 20407) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/Gutter.java 2011-11-22 19:45:48 UTC (rev 20408) @@ -30,6 +30,7 @@ import javax.swing.border.*; import javax.swing.event.*; +import org.gjt.sp.jedit.Registers; import org.gjt.sp.jedit.buffer.BufferAdapter; import org.gjt.sp.jedit.buffer.BufferListener; import org.gjt.sp.jedit.buffer.JEditBuffer; @@ -882,6 +883,7 @@ MouseActionsProvider mouseActions; boolean drag; int toolTipInitialDelay, toolTipReshowDelay; + int selectionStart; boolean selectLines; int selAnchorLine; GutterPopupHandler selectionPopupHandler; @@ -945,9 +947,9 @@ if (e.getX() >= FOLD_MARKER_SIZE) { + selectionStart = textArea.getLineStartOffset(line); Selection s = new Selection.Range( - textArea.getLineStartOffset(line), - getFoldEndOffset(line)); + selectionStart, getFoldEndOffset(line)); if(textArea.isMultipleSelectionEnabled()) textArea.addToSelection(s); else @@ -1123,6 +1125,12 @@ e.translatePoint(-getWidth(),0); textArea.mouseHandler.mouseReleased(e); } + if (selectLines) + { + Selection sel = textArea.getSelectionAtOffset(selectionStart); + if(sel != null) + Registers.setRegister('%', textArea.getSelectedText(sel)); + } drag = false; selectLines = false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-11-22 19:57:40
|
Revision: 20409 http://jedit.svn.sourceforge.net/jedit/?rev=20409&view=rev Author: ezust Date: 2011-11-22 19:57:34 +0000 (Tue, 22 Nov 2011) Log Message: ----------- Merge request#3440289, guard encoding from being set as buffer-local property. Modified Paths: -------------- jEdit/branches/4.5.x/doc/CHANGES.txt jEdit/branches/4.5.x/doc/users-guide/customizing.xml jEdit/branches/4.5.x/doc/users-guide/files.xml jEdit/branches/4.5.x/org/gjt/sp/jedit/buffer/JEditBuffer.java Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349,20375-20376 Modified: jEdit/branches/4.5.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.5.x/doc/CHANGES.txt 2011-11-22 19:45:48 UTC (rev 20408) +++ jEdit/branches/4.5.x/doc/CHANGES.txt 2011-11-22 19:57:34 UTC (rev 20409) @@ -4,14 +4,18 @@ {{{ Version 4.5pre2 -Thanks to Shlomy Reinstein, Alan Ezust, and Björn "Vampire" Kautler for -contributing to this release. +Thanks to Shlomy Reinstein, Alan Ezust, Jarek Czekalski, and +Björn "Vampire" Kautler for contributing to this release. {{{ Bug Fixes - Fixed #3163058: middle mouse button paste doesn't respect gutter selection. (Shlomy Reinstein) +- ":encoding=...:" was treated as buffer local property and caused + confusion about what encoding was used at loading/saving the buffer. + (SF.net patch #3434651 - Jarek Czekalski, for bug #1643580) + }}} {{{ Miscellaneous Modified: jEdit/branches/4.5.x/doc/users-guide/customizing.xml =================================================================== --- jEdit/branches/4.5.x/doc/users-guide/customizing.xml 2011-11-22 19:45:48 UTC (rev 20408) +++ jEdit/branches/4.5.x/doc/users-guide/customizing.xml 2011-11-22 19:57:34 UTC (rev 20409) @@ -117,11 +117,6 @@ offset));</programlisting></entry> </row> - <row><entry><varname>encoding</varname></entry> - <entry> The character encoding that should be used for this file - (only works if at the top of file). - See <xref linkend="encodings"/>. </entry></row> - <row> <entry><varname>folding</varname></entry> @@ -197,6 +192,16 @@ </tbody> </tgroup> </informaltable> + + <para> You may see <literal>:encoding=XXX:</literal> in a file + as it is a buffer-local property and specifying the character encoding + for the file. But it is not really a buffer-local property, and behaves + differently. + It is detected by <literal>buffer-local-properties</literal> detector + only if the detector is selected in encoding options. Thus, it works + only at loading, and it must appear near the top of the file. + See <xref linkend="encodings"/>. </para> + </section> <section id="global-opts"> Modified: jEdit/branches/4.5.x/doc/users-guide/files.xml =================================================================== --- jEdit/branches/4.5.x/doc/users-guide/files.xml 2011-11-22 19:45:48 UTC (rev 20408) +++ jEdit/branches/4.5.x/doc/users-guide/files.xml 2011-11-22 19:57:34 UTC (rev 20409) @@ -283,10 +283,6 @@ <guimenu>Commands</guimenu>><guisubmenu>Encoding</guisubmenu> menu.</para> - <para>It is also possible to override the encoding for a file in a - jEdit "buffer-local" property at the top of the file. See - <xref linkend="buffer-local" /> for more details. </para> - <para>Note that there is no general way to auto-detect the encoding used by a file, however jEdit supports "encoding detectors", of which there are 4 in the core, and others can be provided by plugins through the @@ -321,6 +317,13 @@ a file.</para> <programlisting># -*- coding: utf-8 -*- </programlisting> </listitem> + <listitem> <para> <emphasis role="bold">buffer-local-properties</emphasis>: + Enable buffer-local properties' syntax + (see <xref linkend="buffer-local" />) + at the top of the file to specify encoding. </para> + <programlisting># :encoding=ISO-8859-1: + </programlisting> + </listitem> </itemizedlist> Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/buffer/JEditBuffer.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/buffer/JEditBuffer.java 2011-11-22 19:45:48 UTC (rev 20408) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/buffer/JEditBuffer.java 2011-11-22 19:57:34 UTC (rev 20409) @@ -2794,12 +2794,17 @@ } if(name != null) { - // use the low-level property setting code - // so that if we have a buffer-local - // property with the same value as a default, - // later changes in the default don't affect - // the buffer-local property - properties.put(name,new PropValue(buf.toString(),false)); + // encoding mustn't be set this way as it must + // be equal to encoding used to load or save the + // file. + if (!name.equals(ENCODING)) { + // use the low-level property setting code + // so that if we have a buffer-local + // property with the same value as a default, + // later changes in the default don't affect + // the buffer-local property + properties.put(name,new PropValue(buf.toString(),false)); + } name = null; } buf.setLength(0); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-11-22 20:10:07
|
Revision: 20410 http://jedit.svn.sourceforge.net/jedit/?rev=20410&view=rev Author: ezust Date: 2011-11-22 20:10:01 +0000 (Tue, 22 Nov 2011) Log Message: ----------- 3440537 - Make buildable offline. Modified Paths: -------------- jEdit/branches/4.5.x/doc/CHANGES.txt jEdit/branches/4.5.x/ivysettings.xml Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349,20375-20376 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349,20375-20376,20399 Modified: jEdit/branches/4.5.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.5.x/doc/CHANGES.txt 2011-11-22 19:57:34 UTC (rev 20409) +++ jEdit/branches/4.5.x/doc/CHANGES.txt 2011-11-22 20:10:01 UTC (rev 20410) @@ -9,6 +9,9 @@ {{{ Bug Fixes +- Building offline was prevented by a bug in Ivy, this is workarounded + now in the Ivy settings for jEdit. (Bug #3437212 - Björn "Vampire" Kautler) + - Fixed #3163058: middle mouse button paste doesn't respect gutter selection. (Shlomy Reinstein) Modified: jEdit/branches/4.5.x/ivysettings.xml =================================================================== --- jEdit/branches/4.5.x/ivysettings.xml 2011-11-22 19:57:34 UTC (rev 20409) +++ jEdit/branches/4.5.x/ivysettings.xml 2011-11-22 20:10:01 UTC (rev 20410) @@ -29,7 +29,9 @@ <include url="${ivy.default.settings.dir}/ivysettings-default-chain.xml"/> <resolvers> - <url name="launch4j"> + <!-- Don't validate because of https://issues.apache.org/jira/browse/IVY-1322, + remove validate after that bug was fixed in Ivy (Bug #3437212) --> + <url name="launch4j" validate="false"> <artifact pattern="http://downloads.sourceforge.net/project/launch4j/launch4j-3/[revision]/[artifact]-[revision]-[classifier].[ext]" /> </url> <url name="jedit-plugins"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-11-25 17:23:36
|
Revision: 20422 http://jedit.svn.sourceforge.net/jedit/?rev=20422&view=rev Author: ezust Date: 2011-11-25 17:23:30 +0000 (Fri, 25 Nov 2011) Log Message: ----------- Merge Req# 3440629 for Bug# 3438680: Buffer-local properties at the end of the buffer and escaping. Modified Paths: -------------- jEdit/branches/4.5.x/doc/CHANGES.txt jEdit/branches/4.5.x/org/gjt/sp/jedit/buffer/JEditBuffer.java Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349,20375-20376,20399 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349,20375-20376,20399,20401 Modified: jEdit/branches/4.5.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.5.x/doc/CHANGES.txt 2011-11-25 17:07:44 UTC (rev 20421) +++ jEdit/branches/4.5.x/doc/CHANGES.txt 2011-11-25 17:23:30 UTC (rev 20422) @@ -9,6 +9,10 @@ {{{ Bug Fixes +- When parsing buffer-local properties, there was a problem with escape + processing that prevented buffer-local properties to be read sometimes + (Bug #3438680 - Björn "Vampire" Kautler) + - Building offline was prevented by a bug in Ivy, this is workarounded now in the Ivy settings for jEdit. (Bug #3437212 - Björn "Vampire" Kautler) Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/buffer/JEditBuffer.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/buffer/JEditBuffer.java 2011-11-25 17:07:44 UTC (rev 20421) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/buffer/JEditBuffer.java 2011-11-25 17:23:30 UTC (rev 20422) @@ -2845,6 +2845,7 @@ } default: buf.append(c); + escape = false; break; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <Vam...@us...> - 2011-12-01 00:30:19
|
Revision: 20475 http://jedit.svn.sourceforge.net/jedit/?rev=20475&view=rev Author: Vampire0 Date: 2011-12-01 00:30:11 +0000 (Thu, 01 Dec 2011) Log Message: ----------- update SF community growth hacker Modified Paths: -------------- jEdit/branches/4.5.x/doc/releasing-jedit.txt Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349,20375-20376,20399,20401 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349,20375-20376,20399,20401,20474 Modified: jEdit/branches/4.5.x/doc/releasing-jedit.txt =================================================================== --- jEdit/branches/4.5.x/doc/releasing-jedit.txt 2011-12-01 00:25:46 UTC (rev 20474) +++ jEdit/branches/4.5.x/doc/releasing-jedit.txt 2011-12-01 00:30:11 UTC (rev 20475) @@ -128,7 +128,7 @@ - On Google+ - On Facebook - On the jEdit Community page - - Send a mail to the Community Growth Hacker of SourceForge for promotion of the release, currently this is Elizabeth Naramore <eli...@so...> + - Send a mail to the Community Growth Hacker of SourceForge for promotion of the release, currently this is Rich Bowen <com...@so...> - Send a mail to Heise for inclusion in the weekly Heise Developer Snapshots at dev...@ix... 14. Delete the [tag] folder This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-12-03 06:28:09
|
Revision: 20502 http://jedit.svn.sourceforge.net/jedit/?rev=20502&view=rev Author: ezust Date: 2011-12-03 06:28:03 +0000 (Sat, 03 Dec 2011) Log Message: ----------- Fixed a NPE when trying to activate a plugin if one of it's dependencies is missing (#2077205) (Matthieu Casanova) Merge req# 3448334 Modified Paths: -------------- jEdit/branches/4.5.x/doc/CHANGES.txt jEdit/branches/4.5.x/org/gjt/sp/jedit/PluginJAR.java Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349,20375-20376,20399,20401,20474 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349,20375-20376,20399,20401,20474,20486 Modified: jEdit/branches/4.5.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.5.x/doc/CHANGES.txt 2011-12-03 05:48:06 UTC (rev 20501) +++ jEdit/branches/4.5.x/doc/CHANGES.txt 2011-12-03 06:28:03 UTC (rev 20502) @@ -4,11 +4,15 @@ {{{ Version 4.5pre2 -Thanks to Shlomy Reinstein, Alan Ezust, Jarek Czekalski, and -Björn "Vampire" Kautler for contributing to this release. +Thanks to Shlomy Reinstein, Alan Ezust, Jarek Czekalski, +Matthieu Casanova, and Björn "Vampire" Kautler for +contributing to this release. {{{ Bug Fixes +- Fixed a NPE when trying to activate a plugin if one of it's dependencies is + missing (#2077205) (Matthieu Casanova) + - When parsing buffer-local properties, there was a problem with escape processing that prevented buffer-local properties to be read sometimes (Bug #3438680 - Björn "Vampire" Kautler) Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/PluginJAR.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/PluginJAR.java 2011-12-03 05:48:06 UTC (rev 20501) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/PluginJAR.java 2011-12-03 06:28:03 UTC (rev 20502) @@ -187,6 +187,12 @@ for (String jarName: pluginLoadList) { String jarPath = findPlugin(jarName); + if (jarPath == null) + { + Log.log(Log.WARNING, PluginJAR.class, "Unable to load dependency " + jarName+ + " the plugin is not installed"); + continue; + } load(jarPath, true); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2011-12-07 04:10:03
|
Revision: 20559 http://jedit.svn.sourceforge.net/jedit/?rev=20559&view=rev Author: ezust Date: 2011-12-07 04:09:57 +0000 (Wed, 07 Dec 2011) Log Message: ----------- Merge Request# 3444465 Fixed #3434527: Jump to wrong line with folded target (Evan Wright) Modified Paths: -------------- jEdit/branches/4.5.x/doc/CHANGES.txt jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/DisplayManager.java jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/TextArea.java Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20347,20349,20375-20376,20399,20401,20474,20486 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486 Modified: jEdit/branches/4.5.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.5.x/doc/CHANGES.txt 2011-12-06 22:21:19 UTC (rev 20558) +++ jEdit/branches/4.5.x/doc/CHANGES.txt 2011-12-07 04:09:57 UTC (rev 20559) @@ -27,6 +27,8 @@ confusion about what encoding was used at loading/saving the buffer. (SF.net patch #3434651 - Jarek Czekalski, for bug #1643580) +- Fixed #3434527: Jump to wrong line with folded target (Evan Wright) + }}} {{{ Miscellaneous Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/DisplayManager.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/DisplayManager.java 2011-12-06 22:21:19 UTC (rev 20558) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/DisplayManager.java 2011-12-07 04:09:57 UTC (rev 20559) @@ -129,6 +129,44 @@ return folds.search(line) % 2 == 0; } //}}} + //{{{ isOutsideNarrowing() method + /** + * Returns true if the display is narrowed and the specified line is + * outside of the narrowing. + * @param line A physical line index + * @since jEdit 5.0 + */ + public boolean isOutsideNarrowing(int line) + { + if (line < getFirstVisibleLine()) + return true; + + // If the line is beyond the last visible line, it may still be within the narrowed + // display if the last visible line is a root for the fold containing the given + // line. + if (line > getLastVisibleLine()) + { + int lastVisible = getLastVisibleLine(); + int lastVisibleLevel = buffer.getFoldLevel(lastVisible); + if (buffer.getFoldLevel(line) <= lastVisibleLevel) + return true; + + // Any line between the last visible and the given line with a fold level + // <= that of the last visible will break the root-child relationship + for (int i = lastVisible + 1; i <= line; i++) + { + if (buffer.getFoldLevel(i) <= lastVisibleLevel) + return true; + } + + // If we get to this point, it means that the last visible line is a + // fold-level root for the given line + return false; + } + + return false; + } //}}} + //{{{ getFirstVisibleLine() method /** * Returns the physical line number of the first visible line. @@ -334,9 +372,11 @@ /** * Expands all folds with the specified fold level. * @param foldLevel The fold level - * @since jEdit 4.2pre1 + * @param update If true, notify the text area of a fold level change. Since this will + * automatically move the caret if still inside a fold, this may not be what we want. + * @since jEdit 5.0 */ - public void expandFolds(int foldLevel) + public void expandFolds(int foldLevel, boolean update) { if(buffer.getFoldHandler() instanceof IndentFoldHandler) foldLevel = (foldLevel - 1) * buffer.getIndentSize() + 1; @@ -372,11 +412,22 @@ hideLineRange(firstInvisible,buffer.getLineCount() - 1); notifyScreenLineChanges(); - if(textArea.getDisplayManager() == this) + if(update && textArea.getDisplayManager() == this) { textArea.foldStructureChanged(); } } //}}} + + //{{{ expandFolds() method + /** + * Expands all folds with the specified fold level. + * @param foldLevel The fold level + * @since jEdit 4.2pre1 + */ + public void expandFolds(int foldLevel) + { + expandFolds(foldLevel, true); + } //}}} //{{{ narrow() method /** @@ -794,10 +845,6 @@ int lineCount = buffer.getLineCount(); int end = lineCount - 1; - if (line == lineCount - 1) - { - return false; - } while (!isLineVisible(line)) { int prevLine = folds.lookup(folds.search(line)) - 1; @@ -806,7 +853,7 @@ return unfolded; } - // If any fold farther down was unfolded, then the text + // If any fold farther up was unfolded, then the text // area needs to be updated unfolded |= _expandFold(prevLine, fully, firstSubfold); @@ -815,7 +862,10 @@ return unfolded; } } - if (isLineVisible(line+1) && !fully) + + // At this point, line is already visible, but if the fully flag is set, we may + // still need to look for and show its subfolds. + if (line == (lineCount - 1) || (isLineVisible(line + 1) && !fully)) { return unfolded; } Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/TextArea.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/TextArea.java 2011-12-06 22:21:19 UTC (rev 20558) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/textarea/TextArea.java 2011-12-07 04:09:57 UTC (rev 20559) @@ -5052,16 +5052,19 @@ caretTimer.restart(); if(!displayManager.isLineVisible(caretLine)) - { - if(caretLine < displayManager.getFirstVisibleLine() - || caretLine > displayManager.getLastVisibleLine()) + { + // If we've jumped outside of a narrowed display, just reset all + // folds to their default level, so that we don't get disconnected + // islands of visible lines. + if(displayManager.isOutsideNarrowing(caretLine)) { int collapseFolds = buffer.getIntegerProperty( "collapseFolds",0); if(collapseFolds != 0) { - displayManager.expandFolds(collapseFolds); - displayManager.expandFold(caretLine,false); + displayManager.expandFolds(collapseFolds, false); + displayManager.expandFold(caretLine, false); + foldStructureChanged(); } else displayManager.expandAllFolds(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <k_s...@us...> - 2011-12-25 17:23:23
|
Revision: 20697 http://jedit.svn.sourceforge.net/jedit/?rev=20697&view=rev Author: k_satoda Date: 2011-12-25 17:23:17 +0000 (Sun, 25 Dec 2011) Log Message: ----------- Reviewed and accepted SF.net merge request #3462488: \r could be pasted from clipboard into buffer. (SF.net bug #3142456) The entry in CHANGES.txt was added by me. Modified Paths: -------------- jEdit/branches/4.5.x/doc/CHANGES.txt jEdit/branches/4.5.x/org/gjt/sp/jedit/Registers.java Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486,20594,20696 Modified: jEdit/branches/4.5.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.5.x/doc/CHANGES.txt 2011-12-25 17:14:28 UTC (rev 20696) +++ jEdit/branches/4.5.x/doc/CHANGES.txt 2011-12-25 17:23:17 UTC (rev 20697) @@ -28,7 +28,10 @@ (SF.net patch #3434651 - Jarek Czekalski, for bug #1643580) - Fixed #3434527: Jump to wrong line with folded target (Evan Wright) - + +- \r (0x0A, CR) could be pasted from clipboard into buffer. + (Bug #3142456 - Matthieu Casanova) + }}} {{{ Miscellaneous Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/Registers.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/Registers.java 2011-12-25 17:14:28 UTC (rev 20696) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/Registers.java 2011-12-25 17:23:17 UTC (rev 20697) @@ -455,9 +455,7 @@ try { Object data = transferable.getTransferData(dataFlavor); - if (dataFlavor.getRepresentationClass().equals(String.class)) - return (String) data; - return data.toString(); + return stripEOLChars(data.toString()); } catch (UnsupportedFlavorException e) { @@ -694,6 +692,38 @@ } } //}}} + //{{{ loadRegisters() method + private static String stripEOLChars(String selection) throws IOException + { + boolean trailingEOL = selection.endsWith("\n") + || selection.endsWith(System.getProperty( + "line.separator")); + + // Some Java versions return the clipboard + // contents using the native line separator, + // so have to convert it here + BufferedReader in = new BufferedReader( + new StringReader(selection)); + StringBuilder buf = new StringBuilder(selection.length()); + String line; + while((line = in.readLine()) != null) + { + // broken Eclipse workaround! + // 24 Febuary 2004 + if(line.endsWith("\0")) + { + line = line.substring(0, + line.length() - 1); + } + buf.append(line); + buf.append('\n'); + } + // remove trailing \n + if(!trailingEOL && buf.length() != 0) + buf.setLength(buf.length() - 1); + return buf.toString(); + } //}}} + //}}} //{{{ Inner classes @@ -777,33 +807,7 @@ .getContents(this).getTransferData( DataFlavor.stringFlavor); - boolean trailingEOL = selection.endsWith("\n") - || selection.endsWith(System.getProperty( - "line.separator")); - - // Some Java versions return the clipboard - // contents using the native line separator, - // so have to convert it here - BufferedReader in = new BufferedReader( - new StringReader(selection)); - StringBuilder buf = new StringBuilder(); - String line; - while((line = in.readLine()) != null) - { - // broken Eclipse workaround! - // 24 Febuary 2004 - if(line.endsWith("\0")) - { - line = line.substring(0, - line.length() - 1); - } - buf.append(line); - buf.append('\n'); - } - // remove trailing \n - if(!trailingEOL && buf.length() != 0) - buf.setLength(buf.length() - 1); - return buf.toString(); + return stripEOLChars(selection); } catch(Exception e) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2012-01-12 23:05:19
|
Revision: 20765 http://jedit.svn.sourceforge.net/jedit/?rev=20765&view=rev Author: ezust Date: 2012-01-12 23:05:12 +0000 (Thu, 12 Jan 2012) Log Message: ----------- Merge request # 3453932: - Added select all and select none buttons to PingPongList fixing a bug in EncodingsOptionPane (#3434850) Modified Paths: -------------- jEdit/branches/4.5.x/doc/CHANGES.txt jEdit/branches/4.5.x/org/gjt/sp/jedit/gui/PingPongList.java jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props jEdit/branches/4.5.x/org/gjt/sp/jedit/options/EncodingsOptionPane.java Modified: jEdit/branches/4.5.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.5.x/doc/CHANGES.txt 2012-01-12 21:05:23 UTC (rev 20764) +++ jEdit/branches/4.5.x/doc/CHANGES.txt 2012-01-12 23:05:12 UTC (rev 20765) @@ -32,6 +32,11 @@ - \r (0x0A, CR) could be pasted from clipboard into buffer. (Bug #3142456 - Matthieu Casanova) +- Added select all and select none buttons to PingPongList fixing a bug in + EncodingsOptionPane (#3434850) (Matthieu Casanova) + + + }}} {{{ Miscellaneous Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/gui/PingPongList.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/gui/PingPongList.java 2012-01-12 21:05:23 UTC (rev 20764) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/gui/PingPongList.java 2012-01-12 23:05:12 UTC (rev 20765) @@ -1,5 +1,5 @@ /* - * EncodingsOptionPane.java - Encodings options panel + * PingPongList.java - Ping Pong List * :tabSize=8:indentSize=8:noTabs=false: * :folding=explicit:collapseFolds=1: * @@ -22,22 +22,29 @@ package org.gjt.sp.jedit.gui; import org.gjt.sp.util.Log; - import javax.swing.*; +import javax.swing.event.ListDataEvent; +import javax.swing.event.ListDataListener; import java.awt.*; import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.io.IOException; import java.util.Collection; import java.util.Iterator; import java.util.List; +import static javax.swing.Box.createHorizontalBox; +import static javax.swing.Box.createHorizontalStrut; +import static org.gjt.sp.jedit.jEdit.getProperty; + /** * @author Matthieu Casanova * @since jEdit 4.4pre1 */ -public class PingPongList<E> extends JSplitPane +public class PingPongList<E> extends JPanel { private final MyListModel<E> leftModel; private final MyListModel<E> rightModel; @@ -47,6 +54,8 @@ private JLabel rightLabel; private JPanel leftPanel; private JPanel rightPanel; + private JButton selectAllButton; + private JButton selectNoneButton; public PingPongList(List<E> leftData, List<E> rightData) { @@ -55,7 +64,8 @@ public PingPongList(int newOrientation, List<E> leftData, List<E> rightData) { - super(newOrientation); + super(new BorderLayout()); + JSplitPane splitPane = new JSplitPane(newOrientation); leftModel = new MyListModel<E>(leftData); left = new JList(leftModel); rightModel = new MyListModel<E>(rightData); @@ -66,15 +76,40 @@ JScrollPane rightScroll = new JScrollPane(right); leftPanel.add(leftScroll); rightPanel.add(rightScroll); - setLeftComponent(leftPanel); - setRightComponent(rightPanel); + splitPane.setLeftComponent(leftPanel); + splitPane.setRightComponent(rightPanel); left.setDragEnabled(true); right.setDragEnabled(true); MyTransferHandler myTransferHandler = new MyTransferHandler(); left.setTransferHandler(myTransferHandler); right.setTransferHandler(myTransferHandler); - setDividerLocation(0.5); + splitPane.setDividerLocation(0.5); + + // Select All/None Buttons + Box buttonsBox = createHorizontalBox(); + buttonsBox.add(createHorizontalStrut(12)); + + ActionListener actionHandler = new ActionHandler(); + selectAllButton = new JButton(getProperty("common.selectAll")); + selectAllButton.addActionListener(actionHandler); + selectAllButton.setEnabled(getLeftSize() != 0); + buttonsBox.add(selectAllButton); + buttonsBox.add(createHorizontalStrut(12)); + + selectNoneButton = new JButton(getProperty("common.selectNone")); + selectNoneButton.addActionListener(actionHandler); + selectNoneButton.setEnabled(getRightSize() != 0); + buttonsBox.add(selectNoneButton); + buttonsBox.add(createHorizontalStrut(12)); + + add(splitPane, BorderLayout.CENTER); + add(buttonsBox, BorderLayout.SOUTH); + + ListDataListener listDataListener = new MyListDataListener(); + leftModel.addListDataListener(listDataListener); + rightModel.addListDataListener(listDataListener); + } public void setLeftTooltip(String leftTooltip) @@ -166,7 +201,8 @@ rightModel.addAll(leftModel.data); leftModel.clear(); } - + //{{{ Inner Classes + private static class MyListModel<E> extends AbstractListModel implements Iterable<E> { private List<E> data; @@ -339,4 +375,56 @@ return data; } } + + //{{{ ActionHandler class + private class ActionHandler implements ActionListener + { + @Override + public void actionPerformed(ActionEvent ae) + { + Object source = ae.getSource(); + if (source == selectAllButton) + { + moveAllToRight(); + selectAllButton.setEnabled(false); + selectNoneButton.setEnabled(true); + } + else if (source == selectNoneButton) + { + moveAllToLeft(); + selectAllButton.setEnabled(true); + selectNoneButton.setEnabled(false); + } + } + } //}}} + + private class MyListDataListener implements ListDataListener + { + @Override + public void intervalAdded(ListDataEvent e) + { + dataUpdated(e); + } + + @Override + public void intervalRemoved(ListDataEvent e) + { + dataUpdated(e); + } + + @Override + public void contentsChanged(ListDataEvent e) + { + dataUpdated(e); + } + + private void dataUpdated(ListDataEvent e) + { + selectAllButton.setEnabled(getLeftSize() != 0); + selectNoneButton.setEnabled(getRightSize() != 0); + } + } + //}}} + + } Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props 2012-01-12 21:05:23 UTC (rev 20764) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props 2012-01-12 23:05:12 UTC (rev 20765) @@ -38,6 +38,8 @@ common.moveDown.icon=22x22/actions/go-down.png common.clearAll=Clear All common.clearAll.icon=22x22/actions/edit-clear.png +common.selectAll=Select All +common.selectNone=Select None lineSep.unix=Unix (\\n) lineSep.windows=DOS/Windows (\\r\\n) @@ -1977,8 +1979,6 @@ Drag them to the right column to activate them</html> options.encodings.selected.tooltip=Encodings in this column be shown in encoding dialogs.\ Drag them to the left column to hide them -options.encodings.selectAll=Select All -options.encodings.selectNone=Select None #}}} #{{{ Gutter pane Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/options/EncodingsOptionPane.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/options/EncodingsOptionPane.java 2012-01-12 21:05:23 UTC (rev 20764) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/options/EncodingsOptionPane.java 2012-01-12 23:05:12 UTC (rev 20765) @@ -24,13 +24,9 @@ package org.gjt.sp.jedit.options; //{{{ Imports -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import javax.swing.Box; -import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JTextField; @@ -41,8 +37,6 @@ import org.gjt.sp.util.StandardUtilities; import static java.awt.GridBagConstraints.BOTH; import static java.util.Arrays.sort; -import static javax.swing.Box.createHorizontalBox; -import static javax.swing.Box.createHorizontalStrut; import static org.gjt.sp.jedit.jEdit.getBooleanProperty; import static org.gjt.sp.jedit.jEdit.getProperty; import static org.gjt.sp.jedit.jEdit.setBooleanProperty; @@ -67,8 +61,6 @@ private JTextField encodingDetectors; private JTextField fallbackEncodings; private JComboBox lineSeparator; - private JButton selectAllButton; - private JButton selectNoneButton; private PingPongList<String> pingPongList; //}}} @@ -148,24 +140,6 @@ pingPongList.setRightTooltip(getProperty("options.encodings.selected.tooltip")); addComponent(pingPongList,BOTH); - // Select All/None Buttons - Box buttonsBox = createHorizontalBox(); - buttonsBox.add(createHorizontalStrut(12)); - - ActionHandler actionHandler = new ActionHandler(); - selectAllButton = new JButton(getProperty("options.encodings.selectAll")); - selectAllButton.addActionListener(actionHandler); - selectAllButton.setEnabled(pingPongList.getLeftSize() != 0); - buttonsBox.add(selectAllButton); - buttonsBox.add(createHorizontalStrut(12)); - - selectNoneButton = new JButton(getProperty("options.encodings.selectNone")); - selectNoneButton.addActionListener(actionHandler); - selectNoneButton.setEnabled(pingPongList.getRightSize() != 0); - buttonsBox.add(selectNoneButton); - buttonsBox.add(createHorizontalStrut(12)); - - addComponent(buttonsBox); } //}}} //{{{ _save() method @@ -208,23 +182,4 @@ } } //}}} - //{{{ Inner classes - - //{{{ ActionHandler class - private class ActionHandler implements ActionListener - { - public void actionPerformed(ActionEvent ae) - { - Object source = ae.getSource(); - if (source == selectAllButton) - { - pingPongList.moveAllToRight(); - } - else if (source == selectNoneButton) - { - pingPongList.moveAllToLeft(); - } - } - } //}}} - //}}} } //}}} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2012-01-14 01:51:54
|
Revision: 20787 http://jedit.svn.sourceforge.net/jedit/?rev=20787&view=rev Author: ezust Date: 2012-01-14 01:51:43 +0000 (Sat, 14 Jan 2012) Log Message: ----------- Merge req#3454524 - fixed copy lines macro. Modified Paths: -------------- jEdit/branches/4.5.x/doc/CHANGES.txt jEdit/branches/4.5.x/macros/Clipboard/Copy_Lines.bsh Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486,20594,20696 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486,20578,20581-20582,20594,20696 Modified: jEdit/branches/4.5.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.5.x/doc/CHANGES.txt 2012-01-13 23:26:48 UTC (rev 20786) +++ jEdit/branches/4.5.x/doc/CHANGES.txt 2012-01-14 01:51:43 UTC (rev 20787) @@ -9,6 +9,8 @@ contributing to this release. {{{ Bug Fixes +- Fixed Copy_Line macro that was copying one character of the next line (#3454377) + (Matthieu Casanova) - Fixed a NPE when trying to activate a plugin if one of it's dependencies is missing (#2077205) (Matthieu Casanova) Modified: jEdit/branches/4.5.x/macros/Clipboard/Copy_Lines.bsh =================================================================== --- jEdit/branches/4.5.x/macros/Clipboard/Copy_Lines.bsh 2012-01-13 23:26:48 UTC (rev 20786) +++ jEdit/branches/4.5.x/macros/Clipboard/Copy_Lines.bsh 2012-01-14 01:51:43 UTC (rev 20787) @@ -8,15 +8,19 @@ * $Id$ */ -copyLines(){ +copyLines() +{ selections = textArea.getSelectedLines(); - if(selections.length == 0){ + if(selections.length == 0) + { selections = new int [] {textArea.getCaretLine()}; } start = textArea.getLineStartOffset(selections[0]); stop = textArea.getLineEndOffset(selections[selections.length-1]); - Registers.getRegister('$').setValue(textArea.getText(start,stop-start+1)); + String text = textArea.getText(start,stop-start); + java.awt.datatransfer.Transferable value = new java.awt.datatransfer.StringSelection(text); + Registers.getRegister('$').setTransferable(value); } copyLines(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2012-01-14 08:53:49
|
Revision: 20791 http://jedit.svn.sourceforge.net/jedit/?rev=20791&view=rev Author: kpouer Date: 2012-01-14 08:53:42 +0000 (Sat, 14 Jan 2012) Log Message: ----------- merged revision 20579 (sending propertiesChanged() after plugin load/unload req #3454553 Revision Links: -------------- http://jedit.svn.sourceforge.net/jedit/?rev=20579&view=rev Modified Paths: -------------- jEdit/branches/4.5.x/org/gjt/sp/jedit/PluginJAR.java jEdit/branches/4.5.x/org/gjt/sp/jedit/pluginmgr/ManagePanel.java Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486,20578,20581-20582,20594,20696 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486,20578-20579,20581-20582,20594,20696 Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/PluginJAR.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/PluginJAR.java 2012-01-14 07:49:55 UTC (rev 20790) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/PluginJAR.java 2012-01-14 08:53:42 UTC (rev 20791) @@ -214,6 +214,7 @@ } jar.checkDependencies(); jar.activatePluginIfNecessary(); + jEdit.propertiesChanged(); return jar; } // }}} Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/pluginmgr/ManagePanel.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/pluginmgr/ManagePanel.java 2012-01-14 07:49:55 UTC (rev 20790) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/pluginmgr/ManagePanel.java 2012-01-14 08:53:42 UTC (rev 20791) @@ -642,6 +642,7 @@ } jEdit.removePluginJAR(jar,false); jEdit.setBooleanProperty("plugin-blacklist."+MiscUtilities.getFileName(jar.getPath()),true); + jEdit.propertiesChanged(); } //}}} //{{{ saveSelection() method This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ez...@us...> - 2012-01-14 16:52:32
|
Revision: 20798 http://jedit.svn.sourceforge.net/jedit/?rev=20798&view=rev Author: ezust Date: 2012-01-14 16:52:26 +0000 (Sat, 14 Jan 2012) Log Message: ----------- Merge req# 3456373 - Large file mode dialog error. Modified Paths: -------------- jEdit/branches/4.5.x/doc/CHANGES.txt jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486,20578-20579,20581-20582,20594,20696 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486,20578-20579,20581-20582,20594,20597,20696 Modified: jEdit/branches/4.5.x/doc/CHANGES.txt =================================================================== --- jEdit/branches/4.5.x/doc/CHANGES.txt 2012-01-14 16:45:10 UTC (rev 20797) +++ jEdit/branches/4.5.x/doc/CHANGES.txt 2012-01-14 16:52:26 UTC (rev 20798) @@ -9,6 +9,9 @@ contributing to this release. {{{ Bug Fixes + +- Large file mode text description dialog (#3456370) (Matthieu Casanova) + - Fixed Copy_Line macro that was copying one character of the next line (#3454377) (Matthieu Casanova) Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props 2012-01-14 16:45:10 UTC (rev 20797) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/jedit_gui.props 2012-01-14 16:52:26 UTC (rev 20798) @@ -1201,20 +1201,19 @@ #{{{ largeBufferDialog.title=Large buffer {0} -largeBufferDialog.message=The buffer is very large and jEdit may become\n\ - unresponsive because of syntax highlight. You should consider the\n\ - following options.\n\ - -Keep Full syntax : jEdit's syntax highlight will work as usual, jEdit\n\ - may become very slow, this is not recommanded.\n\ - -Context insensitive syntax highlight. In that case jEdit will try to\n\ - keep some syntax highlight, but the result may not be perfect. The\n\ - buffer is highlighted line by line without taking care of the context\n\ - of the previous line. So it is possible that the syntax is not accurate\n\ - if you have tokens on multiple lines (multiline comments, xml tags ...) - -Use default edit mode of jEdit (usually text mode, no syntax highlight) +largeBufferDialog.message=The buffer is very large and jEdit may become unresponsive\n\ + due to syntax highlighting. You should consider the following options.\n\ + -Keep Full syntax : jEdit's syntax highlight will work as usual, jEdit \n\ + may become very slow, this is not recommended.\n\ + -Context insensitive syntax highlighting. In this case, jEdit will\n\ + do fast highlighting, but the result may not be perfect. The\n\ + buffer is highlighted line by line without checking context\n\ + of the previous line. It is possible that the syntax is not accurate\n\ + if you have tokens on multiple lines (multiline comments, xml tags ...)\n\ + -Use 'text' mode of jEdit (no syntax highlighting) largeBufferDialog.fullSyntax=Full syntax highlight largeBufferDialog.contextInsensitive=Context insensitive syntax highlight -largeBufferDialog.defaultMode=Default edit mode +largeBufferDialog.defaultMode=Text edit mode #}}} #{{{ I/O error dialog box This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2012-01-19 07:49:02
|
Revision: 20855 http://jedit.svn.sourceforge.net/jedit/?rev=20855&view=rev Author: kpouer Date: 2012-01-19 07:48:56 +0000 (Thu, 19 Jan 2012) Log Message: ----------- merge request #3474521 MiscUtilities.expandVariables does not expand ~ To fix bug https://sourceforge.net/tracker/index.php?func=detail&aid=3474515&group_id=588&atid=100588 Modified Paths: -------------- jEdit/branches/4.5.x/org/gjt/sp/jedit/MiscUtilities.java Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486,20578-20579,20581-20582,20594,20597,20696 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486,20578-20579,20581-20582,20594,20597,20696,20825 Modified: jEdit/branches/4.5.x/org/gjt/sp/jedit/MiscUtilities.java =================================================================== --- jEdit/branches/4.5.x/org/gjt/sp/jedit/MiscUtilities.java 2012-01-19 07:38:41 UTC (rev 20854) +++ jEdit/branches/4.5.x/org/gjt/sp/jedit/MiscUtilities.java 2012-01-19 07:48:56 UTC (rev 20855) @@ -137,6 +137,8 @@ */ public static String expandVariables(String arg) { + if (arg.startsWith("~/") || arg.startsWith("~\\")) + return System.getProperty("user.home") + arg.substring(1); Pattern p = varPattern; Matcher m = p.matcher(arg); if (!m.find()) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <kp...@us...> - 2012-01-19 07:53:16
|
Revision: 20856 http://jedit.svn.sourceforge.net/jedit/?rev=20856&view=rev Author: kpouer Date: 2012-01-19 07:53:10 +0000 (Thu, 19 Jan 2012) Log Message: ----------- merge request #3449003 remove max heap size limit to 192MB Modified Paths: -------------- jEdit/branches/4.5.x/build.xml jEdit/branches/4.5.x/installer/OperatingSystem.java jEdit/branches/4.5.x/package-files/linux/jedit jEdit/branches/4.5.x/package-files/windows/win32installer.iss Removed Paths: ------------- jEdit/branches/4.5.x/package-files/windows/jedit.l4j.ini Property Changed: ---------------- jEdit/branches/4.5.x/ Property changes on: jEdit/branches/4.5.x ___________________________________________________________________ Modified: svn:mergeinfo - /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486,20578-20579,20581-20582,20594,20597,20696,20825 + /jEdit/branches/docking_framework:13128-13258 /jEdit/trunk:20117,20132,20226,20250,20254,20262,20264,20277,20296,20308,20347,20349,20375-20376,20399,20401,20474,20486,20500,20578-20579,20581-20582,20594,20597,20696,20825 Modified: jEdit/branches/4.5.x/build.xml =================================================================== --- jEdit/branches/4.5.x/build.xml 2012-01-19 07:48:56 UTC (rev 20855) +++ jEdit/branches/4.5.x/build.xml 2012-01-19 07:53:10 UTC (rev 20856) @@ -506,8 +506,7 @@ description="run jEdit"> <java jar="${jar.location}/${jar.filename}" fork="true" - spawn="true" - maxmemory="192M"> + spawn="true"> <arg value="-settings=${build.dir}/settings"/> </java> </target> @@ -517,8 +516,7 @@ description="run jEdit with debug listening enabled"> <java jar="${jar.location}/${jar.filename}" fork="true" - spawn="true" - maxmemory="192M"> + spawn="true"> <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,address=localhost:5005,timeout=60000"/> <arg value="-settings=${build.dir}/settings"/> </java> Modified: jEdit/branches/4.5.x/installer/OperatingSystem.java =================================================================== --- jEdit/branches/4.5.x/installer/OperatingSystem.java 2012-01-19 07:48:56 UTC (rev 20855) +++ jEdit/branches/4.5.x/installer/OperatingSystem.java 2012-01-19 07:53:10 UTC (rev 20856) @@ -180,9 +180,6 @@ out.write("# Runs jEdit - Programmer's Text Editor.\n"); out.write("#\n"); out.write("\n"); - out.write("# Set jvm heap initial and maximum sizes (in megabytes).\n"); - out.write("JAVA_HEAP_MAX_SIZE=192\n"); - out.write("\n"); out.write("# Find a java installation.\n"); out.write("if [ -z \"${JAVA_HOME}\" ]; then\n"); out.write(" echo 'Warning: $JAVA_HOME environment variable not set! Consider setting it.'\n"); @@ -201,7 +198,7 @@ out.write("\n"); out.write("# Launch application.\n"); out.write("\n"); - out.write("exec \"${JAVA}\" -Xmx${JAVA_HEAP_MAX_SIZE}M -jar \"" + out.write("exec \"${JAVA}\" -jar \"" + installDir + File.separator + "jedit.jar\" -reuseview \"$@\"\n"); out.close(); Modified: jEdit/branches/4.5.x/package-files/linux/jedit =================================================================== --- jEdit/branches/4.5.x/package-files/linux/jedit 2012-01-19 07:48:56 UTC (rev 20855) +++ jEdit/branches/4.5.x/package-files/linux/jedit 2012-01-19 07:53:10 UTC (rev 20856) @@ -4,8 +4,9 @@ # # Set jvm heap initial and maximum sizes (in megabytes). -JAVA_HEAP_MAX_SIZE=192 +JAVA_HEAP_MAX_SIZE=-Xmx512M + # Find a java installation. if [ -z "${JAVA_HOME}" ]; then echo 'Warning: $JAVA_HOME environment variable not set! Consider setting it.' @@ -24,4 +25,4 @@ # Launch application. -exec "${JAVA}" -Xmx${JAVA_HEAP_MAX_SIZE}M -jar "/usr/share/jEdit/@jar.filename@" -reuseview "$@" +exec "${JAVA}" -jar "/usr/share/jEdit/@jar.filename@" -reuseview "$@" Deleted: jEdit/branches/4.5.x/package-files/windows/jedit.l4j.ini =================================================================== --- jEdit/branches/4.5.x/package-files/windows/jedit.l4j.ini 2012-01-19 07:48:56 UTC (rev 20855) +++ jEdit/branches/4.5.x/package-files/windows/jedit.l4j.ini 2012-01-19 07:53:10 UTC (rev 20856) @@ -1 +0,0 @@ --Xmx192M Modified: jEdit/branches/4.5.x/package-files/windows/win32installer.iss =================================================================== --- jEdit/branches/4.5.x/package-files/windows/win32installer.iss 2012-01-19 07:48:56 UTC (rev 20855) +++ jEdit/branches/4.5.x/package-files/windows/win32installer.iss 2012-01-19 07:53:10 UTC (rev 20856) @@ -55,7 +55,6 @@ [Files] Source: @jar.filename@; DestDir: {app}; Flags: ignoreversion sortfilesbyextension sortfilesbyname; Components: main Source: jedit.exe; DestDir: {app}; Flags: ignoreversion sortfilesbyextension sortfilesbyname; AfterInstall: updatePATHVariable; Components: main -Source: classes\package-files\windows\jedit.l4j.ini; DestDir: {app}; Flags: ignoreversion sortfilesbyextension sortfilesbyname; Components: main Source: classes\package-files\windows\jEdit.url; DestDir: {app}; Flags: ignoreversion sortfilesbyextension sortfilesbyname; Components: main Source: doc\*; DestDir: {app}\doc; Excludes: \doc\api\*; Flags: ignoreversion recursesubdirs createallsubdirs sortfilesbyextension sortfilesbyname; Components: main Source: doc\api\*; DestDir: {app}\doc\api; Flags: ignoreversion recursesubdirs createallsubdirs sortfilesbyextension sortfilesbyname; Components: apidoc This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |